From 050fdda848c766b17b3ee158069be6e746a63765 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 4 Dec 2014 10:23:10 +0000 Subject: [PATCH 001/329] Initial commit --- PHPCI/Helper/Lang.php | 64 +++++++++++++++++++++++++++++++++++++ PHPCI/Languages/lang.en.php | 14 ++++++++ PHPCI/View/layout.phtml | 11 +++++-- bootstrap.php | 2 ++ public/assets/js/sprintf.js | 4 +++ 5 files changed, 93 insertions(+), 2 deletions(-) create mode 100644 PHPCI/Helper/Lang.php create mode 100644 PHPCI/Languages/lang.en.php create mode 100644 public/assets/js/sprintf.js diff --git a/PHPCI/Helper/Lang.php b/PHPCI/Helper/Lang.php new file mode 100644 index 00000000..44017ae6 --- /dev/null +++ b/PHPCI/Helper/Lang.php @@ -0,0 +1,64 @@ +get('phpci.default_language', 'en'); + self::$strings = self::loadLanguage(); + + if (is_null(self::$strings)) { + self::$language = 'en'; + self::$strings = self::loadLanguage(); + } + } + + protected static function loadLanguage() + { + $langFile = PHPCI_DIR . 'PHPCI/Languages/lang.' . self::$language . '.php'; + + if (!file_exists($langFile)) { + return null; + } + + require_once($langFile); + + if (is_null($strings) || !is_array($strings) || !count($strings)) { + return null; + } + + return $strings; + } +} \ No newline at end of file diff --git a/PHPCI/Languages/lang.en.php b/PHPCI/Languages/lang.en.php new file mode 100644 index 00000000..4dc96d09 --- /dev/null +++ b/PHPCI/Languages/lang.en.php @@ -0,0 +1,14 @@ + 'Toggle Navigation', + 'n_builds_pending' => '%d builds pending', + 'n_builds_running' => '%d builds running', +); \ No newline at end of file diff --git a/PHPCI/View/layout.phtml b/PHPCI/View/layout.phtml index dac44274..dfcea870 100644 --- a/PHPCI/View/layout.phtml +++ b/PHPCI/View/layout.phtml @@ -1,3 +1,6 @@ + @@ -18,6 +21,7 @@ + @@ -26,7 +30,10 @@ - + diff --git a/public/assets/css/AdminLTE-custom.css b/public/assets/css/AdminLTE-custom.css new file mode 100644 index 00000000..009a360b --- /dev/null +++ b/public/assets/css/AdminLTE-custom.css @@ -0,0 +1,53 @@ +.skin-blue .logo, .skin-blue .logo:hover { + background-image: url('/assets/img/logo-large.png'); + background-repeat: no-repeat; + background-size: 40%; + background-position: 65px; + text-indent: -5000px; +} + +.build-info-panel { + +} + + .build-info-panel .box-header h1.box-title { + border: 0; + font-size: 1.5em; + font-weight: bold; + margin-left: 110px; + } + + .build-info-panel h1.box-title span { + font-weight: normal; + } + + .build-info-panel img { + border: 2px solid #fff; + border-radius: 50%; + margin-top: -40px; + } + + .build-info-panel #build-info { + margin-left: 110px; + min-height: 50px; + } + + .build-info-panel .commit-message { + margin-bottom: 20px; + } + +.small-box h3 a, .small-box h4 a { + color: #fff; +} + +.pagination>li>span { + font-weight: bold; + background: #337ab7; + color: #fff; +} + +#plugins table td { + max-width: 300px; + overflow: hidden; + text-overflow: ellipsis; +} diff --git a/public/assets/js/build-plugins/phpcpd.js b/public/assets/js/build-plugins/phpcpd.js index c9733678..2a0f3e16 100644 --- a/public/assets/js/build-plugins/phpcpd.js +++ b/public/assets/js/build-plugins/phpcpd.js @@ -23,14 +23,14 @@ var phpcpdPlugin = ActiveBuild.UiPlugin.extend({ render: function() { - return $('' + + return $('
' + '' + '' + ' ' + ' ' + ' ' + '' + - '
'+Lang.get('file')+''+Lang.get('start')+''+Lang.get('end')+'
'); + ''); }, diff --git a/public/assets/js/build-plugins/phpcs.js b/public/assets/js/build-plugins/phpcs.js index f3b1fe67..3e71ba72 100644 --- a/public/assets/js/build-plugins/phpcs.js +++ b/public/assets/js/build-plugins/phpcs.js @@ -22,14 +22,14 @@ var phpcsPlugin = ActiveBuild.UiPlugin.extend({ }, render: function() { - return $('' + + return $('
' + '' + '' + ' ' + ' ' + ' ' + '' + - '
'+Lang.get('file')+''+Lang.get('line')+''+Lang.get('message')+'
'); + ''); }, onUpdate: function(e) { diff --git a/public/assets/js/build-plugins/phpdoccheck.js b/public/assets/js/build-plugins/phpdoccheck.js index 7d284617..04a6a0ad 100644 --- a/public/assets/js/build-plugins/phpdoccheck.js +++ b/public/assets/js/build-plugins/phpdoccheck.js @@ -24,7 +24,7 @@ var phpdoccheckPlugin = ActiveBuild.UiPlugin.extend({ }, render: function() { - return $('' + + return $('
' + '' + '' + ' ' + @@ -32,7 +32,7 @@ var phpdoccheckPlugin = ActiveBuild.UiPlugin.extend({ ' ' + ' ' + '' + - '
'+Lang.get('file')+''+Lang.get('class')+''+Lang.get('method')+'
'); + ''); }, onUpdate: function(e) { diff --git a/public/assets/js/build-plugins/phpmd.js b/public/assets/js/build-plugins/phpmd.js index 57723ba9..d6d5f867 100644 --- a/public/assets/js/build-plugins/phpmd.js +++ b/public/assets/js/build-plugins/phpmd.js @@ -25,7 +25,7 @@ var phpmdPlugin = ActiveBuild.UiPlugin.extend({ render: function() { - return $('' + + return $('
' + '' + '' + ' ' + @@ -33,7 +33,7 @@ var phpmdPlugin = ActiveBuild.UiPlugin.extend({ ' ' + ' ' + '' + - '
'+Lang.get('file')+''+Lang.get('end')+''+Lang.get('message')+'
'); + ''); }, onUpdate: function(e) { diff --git a/public/assets/js/build-plugins/phptallint.js b/public/assets/js/build-plugins/phptallint.js index 9d981c53..fe549b99 100644 --- a/public/assets/js/build-plugins/phptallint.js +++ b/public/assets/js/build-plugins/phptallint.js @@ -22,14 +22,14 @@ var phptalPlugin = ActiveBuild.UiPlugin.extend({ }, render: function() { - return $('' + + return $('
' + '' + '' + ' ' + ' ' + ' ' + '' + - '
FileLineMessage
'); + ''); }, onUpdate: function(e) { diff --git a/public/assets/js/build-plugins/phpunit.js b/public/assets/js/build-plugins/phpunit.js index 0e648e9d..4a55d905 100644 --- a/public/assets/js/build-plugins/phpunit.js +++ b/public/assets/js/build-plugins/phpunit.js @@ -25,12 +25,12 @@ var phpunitPlugin = ActiveBuild.UiPlugin.extend({ render: function() { - return $('' + + return $('
' + '' + '' + ' ' + '' + - '
'+Lang.get('test')+'
'); + ''); }, onUpdate: function(e) { From 8d2c7045a4252ab797cc6b49d55ec3298fec1538 Mon Sep 17 00:00:00 2001 From: corpsee Date: Sun, 11 Jan 2015 13:35:38 +0600 Subject: [PATCH 065/329] Update the "Manual Build" string for the Russian translation. Closes #737 --- PHPCI/Languages/lang.ru.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Languages/lang.ru.php b/PHPCI/Languages/lang.ru.php index 4abc9721..dfef84d9 100644 --- a/PHPCI/Languages/lang.ru.php +++ b/PHPCI/Languages/lang.ru.php @@ -84,7 +84,7 @@ PHPCI', 'success' => 'Успешно', 'successful' => 'Успешна', 'failed' => 'Провалена', - 'manual_build' => 'Ручной сборки', + 'manual_build' => 'Запущена вручную', // Add/Edit Project: 'new_project' => 'Новый проект', From 5dced5f990aebf47b3157e6efc7aa274c4fb4cbc Mon Sep 17 00:00:00 2001 From: corpsee Date: Sun, 11 Jan 2015 16:44:34 +0600 Subject: [PATCH 066/329] Fixing fatal error with $this->controller->layout in Application class. Closes #736 --- PHPCI/Application.php | 7 ++++++- PHPCI/Controller.php | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/PHPCI/Application.php b/PHPCI/Application.php index 88380c87..a8790804 100644 --- a/PHPCI/Application.php +++ b/PHPCI/Application.php @@ -22,6 +22,11 @@ use PHPCI\Model\Build; */ class Application extends b8\Application { + /** + * @var \PHPCI\Controller + */ + protected $controller; + /** * Initialise PHPCI - Handles session verification, routing, etc. */ @@ -100,7 +105,7 @@ class Application extends b8\Application $this->response->setContent($view->render()); } - if ($this->response->hasLayout()) { + if ($this->response->hasLayout() && $this->controller->layout) { $this->setLayoutVariables($this->controller->layout); $this->controller->layout->content = $this->response->getContent(); diff --git a/PHPCI/Controller.php b/PHPCI/Controller.php index b065e857..5fd22594 100644 --- a/PHPCI/Controller.php +++ b/PHPCI/Controller.php @@ -30,6 +30,11 @@ class Controller extends \b8\Controller */ protected $view; + /** + * @var \b8\View + */ + public $layout; + /** * Initialise the controller. */ From cd4ff6c4ea94be4b127dbfb4a1c9988715e2558d Mon Sep 17 00:00:00 2001 From: Adirelle Date: Fri, 9 Jan 2015 08:51:35 +0100 Subject: [PATCH 067/329] Localisation support for dates throughout the front-end using moment.js. Closes #734 Closes #732 --- PHPCI/Helper/Lang.php | 29 + PHPCI/View/Home/index.phtml | 4 +- PHPCI/View/SummaryTable.phtml | 8 +- PHPCI/View/layout.phtml | 1 + Tests/PHPCI/Helper/LangTest.php | 28 + .../daterangepicker/daterangepicker-bs3.css | 85 +- public/assets/js/phpci.js | 9 + .../daterangepicker/daterangepicker.js | 1061 +++++++++++------ 8 files changed, 869 insertions(+), 356 deletions(-) create mode 100644 Tests/PHPCI/Helper/LangTest.php diff --git a/PHPCI/Helper/Lang.php b/PHPCI/Helper/Lang.php index 1877426c..c86de1aa 100644 --- a/PHPCI/Helper/Lang.php +++ b/PHPCI/Helper/Lang.php @@ -13,6 +13,7 @@ use b8\Config; /** * Languages Helper Class - Handles loading strings files and the strings within them. + * * @package PHPCI\Helper */ class Lang @@ -23,6 +24,7 @@ class Lang /** * Get a specific string from the language file. + * * @param $string * @return mixed|string */ @@ -48,6 +50,7 @@ class Lang /** * Get the currently active language. + * * @return string|null */ public static function getLanguage() @@ -57,7 +60,9 @@ class Lang /** * Try and load a language, and if successful, set it for use throughout the system. + * * @param $language + * * @return bool */ public static function setLanguage($language) @@ -73,6 +78,7 @@ class Lang /** * Return a list of available languages and their names. + * * @return array */ public static function getLanguageOptions() @@ -90,6 +96,7 @@ class Lang /** * Get the strings for the currently active language. + * * @return string[] */ public static function getStrings() @@ -99,6 +106,7 @@ class Lang /** * Initialise the Language helper, try load the language file for the user's browser or the configured default. + * * @param Config $config */ public static function init(Config $config) @@ -137,6 +145,7 @@ class Lang /** * Load a specific language file. + * * @return string[]|null */ protected static function loadLanguage() @@ -168,4 +177,24 @@ class Lang } } } + + /** + * Create a time tag for localization. + * + * See http://momentjs.com/docs/#/displaying/format/ for a list of supported formats. + * + * @param \DateTime $dateTime The dateTime to represent. + * @param string $format The moment.js format to use. + * + * @return string The formatted tag. + */ + public static function formatDateTime(\DateTime $dateTime, $format = 'lll') + { + return sprintf( + '', + $dateTime->format(\DateTime::ISO8601), + $format, + $dateTime->format(\DateTime::RFC2822) + ); + } } diff --git a/PHPCI/View/Home/index.phtml b/PHPCI/View/Home/index.phtml index 11db43cf..6e27bb79 100644 --- a/PHPCI/View/Home/index.phtml +++ b/PHPCI/View/Home/index.phtml @@ -48,7 +48,7 @@ ?>
  • - format('M j Y'); ?> +
    • @@ -58,7 +58,7 @@
  • - format('H:i'); ?> +

    getProject()->getTitle(); ?> diff --git a/PHPCI/View/SummaryTable.phtml b/PHPCI/View/SummaryTable.phtml index d8ee8a56..10782a5b 100644 --- a/PHPCI/View/SummaryTable.phtml +++ b/PHPCI/View/SummaryTable.phtml @@ -27,12 +27,12 @@ foreach($projects as $project): case 2: $successes++; $statuses[] = 'ok'; - $success = is_null($success) && !is_null($build->getFinished()) ? $build->getFinished()->format('M j Y g:ia') : $success; + $success = is_null($success) && !is_null($build->getFinished()) ? Lang::formatDateTime($build->getFinished()) : $success; break; case 3: $failures++; $statuses[] = 'failed'; - $failure = is_null($failure) && !is_null($build->getFinished()) ? $build->getFinished()->format('M j Y g:ia') : $failure; + $failure = is_null($failure) && !is_null($build->getFinished()) ? Lang::formatDateTime($build->getFinished()) : $failure; break; } } @@ -59,7 +59,7 @@ foreach($projects as $project): $message = Lang::get('x_of_x_failed', $failures, $buildCount); if (!is_null($lastSuccess) && !is_null($lastSuccess->getFinished())) { - $message .= Lang::get('last_successful_build', $lastSuccess->getFinished()->format('M j Y')); + $message .= Lang::get('last_successful_build', Lang::formatDateTime($lastSuccess->getFinished())); } else { $message .= Lang::get('never_built_successfully'); } @@ -68,7 +68,7 @@ foreach($projects as $project): $shortMessage = Lang::get('all_builds_passed_short', $buildCount, $buildCount); if (!is_null($lastFailure) && !is_null($lastFailure->getFinished())) { - $message .= Lang::get('last_failed_build', $lastFailure->getFinished()->format('M j Y')); + $message .= Lang::get('last_failed_build', Lang::formatDateTime($lastFailure->getFinished())); } else { $message .= Lang::get('never_failed_build'); } diff --git a/PHPCI/View/layout.phtml b/PHPCI/View/layout.phtml index 3375d9df..64ec0834 100644 --- a/PHPCI/View/layout.phtml +++ b/PHPCI/View/layout.phtml @@ -275,6 +275,7 @@ + diff --git a/Tests/PHPCI/Helper/LangTest.php b/Tests/PHPCI/Helper/LangTest.php new file mode 100644 index 00000000..492cca52 --- /dev/null +++ b/Tests/PHPCI/Helper/LangTest.php @@ -0,0 +1,28 @@ +prophesize('DateTime'); + $dateTime->format(DateTime::ISO8601)->willReturn("ISODATE"); + $dateTime->format(DateTime::RFC2822)->willReturn("RFCDATE"); + + $this->assertEquals('', Lang::formatDateTime($dateTime->reveal(), 'FORMAT')); + } + + public function testLang_UseDefaultFormat() + { + $dateTime = $this->prophesize('DateTime'); + $dateTime->format(DateTime::ISO8601)->willReturn("ISODATE"); + $dateTime->format(DateTime::RFC2822)->willReturn("RFCDATE"); + + $this->assertEquals('', Lang::formatDateTime($dateTime->reveal())); + } +} diff --git a/public/assets/css/daterangepicker/daterangepicker-bs3.css b/public/assets/css/daterangepicker/daterangepicker-bs3.css index eed1e9f4..9ddabb1f 100755 --- a/public/assets/css/daterangepicker/daterangepicker-bs3.css +++ b/public/assets/css/daterangepicker/daterangepicker-bs3.css @@ -18,11 +18,16 @@ margin: 4px; } -.daterangepicker.opensright .ranges, .daterangepicker.opensright .calendar { +.daterangepicker.opensright .ranges, .daterangepicker.opensright .calendar, +.daterangepicker.openscenter .ranges, .daterangepicker.openscenter .calendar { float: right; margin: 4px; } +.daterangepicker.single .ranges, .daterangepicker.single .calendar { + float: none; +} + .daterangepicker .ranges { width: 160px; text-align: left; @@ -41,6 +46,14 @@ max-width: 270px; } +.daterangepicker.show-calendar .calendar { + display: block; +} + +.daterangepicker .calendar.single .calendar-date { + border: none; +} + .daterangepicker .calendar th, .daterangepicker .calendar td { font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; white-space: nowrap; @@ -48,7 +61,8 @@ min-width: 32px; } -.daterangepicker .ranges label { +.daterangepicker .daterangepicker_start_input label, +.daterangepicker .daterangepicker_end_input label { color: #333; display: block; font-size: 11px; @@ -66,7 +80,6 @@ } .daterangepicker .ranges .input-mini { - background-color: #eee; border: 1px solid #ccc; border-radius: 4px; color: #555; @@ -153,6 +166,37 @@ content: ''; } +.daterangepicker.openscenter:before { + position: absolute; + top: -7px; + left: 0; + right: 0; + width: 0; + margin-left: auto; + margin-right: auto; + display: inline-block; + border-right: 7px solid transparent; + border-bottom: 7px solid #ccc; + border-left: 7px solid transparent; + border-bottom-color: rgba(0, 0, 0, 0.2); + content: ''; +} + +.daterangepicker.openscenter:after { + position: absolute; + top: -6px; + left: 0; + right: 0; + width: 0; + margin-left: auto; + margin-right: auto; + display: inline-block; + border-right: 6px solid transparent; + border-bottom: 6px solid #fff; + border-left: 6px solid transparent; + content: ''; +} + .daterangepicker.opensright:before { position: absolute; top: -7px; @@ -196,7 +240,7 @@ color: #999; } -.daterangepicker td.disabled { +.daterangepicker td.disabled, .daterangepicker option.disabled { color: #999; } @@ -211,6 +255,24 @@ border-radius: 0; } +.daterangepicker td.start-date { + -webkit-border-radius: 4px 0 0 4px; + -moz-border-radius: 4px 0 0 4px; + border-radius: 4px 0 0 4px; +} + +.daterangepicker td.end-date { + -webkit-border-radius: 0 4px 4px 0; + -moz-border-radius: 0 4px 4px 0; + border-radius: 0 4px 4px 0; +} + +.daterangepicker td.start-date.end-date { + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} + .daterangepicker td.active, .daterangepicker td.active:hover { background-color: #357ebd; border-color: #3071a9; @@ -239,7 +301,20 @@ width: 40%; } -.daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.ampmselect { +.daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.secondselect, .daterangepicker select.ampmselect { width: 50px; margin-bottom: 0; } + +.daterangepicker_start_input { + float: left; +} + +.daterangepicker_end_input { + float: left; + padding-left: 11px +} + +.daterangepicker th.month { + width: auto; +} diff --git a/public/assets/js/phpci.js b/public/assets/js/phpci.js index f98ea959..7e0b0f8b 100644 --- a/public/assets/js/phpci.js +++ b/public/assets/js/phpci.js @@ -3,7 +3,16 @@ var PHPCI = { intervals: {}, init: function () { + // Setup the date locale + moment.locale(PHPCI_LANGUAGE); + $(document).ready(function () { + // Format datetimes + $('time[datetime]').each(function() { + var $this = $(this); + $this.text(moment(this.dateTime).format($this.data('format') || 'lll')); + }); + // Update latest builds every 5 seconds: PHPCI.getBuilds(); PHPCI.intervals.getBuilds = setInterval(PHPCI.getBuilds, 5000); diff --git a/public/assets/js/plugins/daterangepicker/daterangepicker.js b/public/assets/js/plugins/daterangepicker/daterangepicker.js index 11a00fa3..891a1bf4 100755 --- a/public/assets/js/plugins/daterangepicker/daterangepicker.js +++ b/public/assets/js/plugins/daterangepicker/daterangepicker.js @@ -1,60 +1,39 @@ -// moment.js -// version : 2.1.0 -// author : Tim Wood -// license : MIT -// momentjs.com -!function(t){function e(t,e){return function(n){return u(t.call(this,n),e)}}function n(t,e){return function(n){return this.lang().ordinal(t.call(this,n),e)}}function s(){}function i(t){a(this,t)}function r(t){var e=t.years||t.year||t.y||0,n=t.months||t.month||t.M||0,s=t.weeks||t.week||t.w||0,i=t.days||t.day||t.d||0,r=t.hours||t.hour||t.h||0,a=t.minutes||t.minute||t.m||0,o=t.seconds||t.second||t.s||0,u=t.milliseconds||t.millisecond||t.ms||0;this._input=t,this._milliseconds=u+1e3*o+6e4*a+36e5*r,this._days=i+7*s,this._months=n+12*e,this._data={},this._bubble()}function a(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n]);return t}function o(t){return 0>t?Math.ceil(t):Math.floor(t)}function u(t,e){for(var n=t+"";n.lengthn;n++)~~t[n]!==~~e[n]&&r++;return r+i}function f(t){return t?ie[t]||t.toLowerCase().replace(/(.)s$/,"$1"):t}function l(t,e){return e.abbr=t,x[t]||(x[t]=new s),x[t].set(e),x[t]}function _(t){if(!t)return H.fn._lang;if(!x[t]&&A)try{require("./lang/"+t)}catch(e){return H.fn._lang}return x[t]}function m(t){return t.match(/\[.*\]/)?t.replace(/^\[|\]$/g,""):t.replace(/\\/g,"")}function y(t){var e,n,s=t.match(E);for(e=0,n=s.length;n>e;e++)s[e]=ue[s[e]]?ue[s[e]]:m(s[e]);return function(i){var r="";for(e=0;n>e;e++)r+=s[e]instanceof Function?s[e].call(i,t):s[e];return r}}function M(t,e){function n(e){return t.lang().longDateFormat(e)||e}for(var s=5;s--&&N.test(e);)e=e.replace(N,n);return re[e]||(re[e]=y(e)),re[e](t)}function g(t,e){switch(t){case"DDDD":return V;case"YYYY":return X;case"YYYYY":return $;case"S":case"SS":case"SSS":case"DDD":return I;case"MMM":case"MMMM":case"dd":case"ddd":case"dddd":return R;case"a":case"A":return _(e._l)._meridiemParse;case"X":return B;case"Z":case"ZZ":return j;case"T":return q;case"MM":case"DD":case"YY":case"HH":case"hh":case"mm":case"ss":case"M":case"D":case"d":case"H":case"h":case"m":case"s":return J;default:return new RegExp(t.replace("\\",""))}}function p(t){var e=(j.exec(t)||[])[0],n=(e+"").match(ee)||["-",0,0],s=+(60*n[1])+~~n[2];return"+"===n[0]?-s:s}function D(t,e,n){var s,i=n._a;switch(t){case"M":case"MM":i[1]=null==e?0:~~e-1;break;case"MMM":case"MMMM":s=_(n._l).monthsParse(e),null!=s?i[1]=s:n._isValid=!1;break;case"D":case"DD":case"DDD":case"DDDD":null!=e&&(i[2]=~~e);break;case"YY":i[0]=~~e+(~~e>68?1900:2e3);break;case"YYYY":case"YYYYY":i[0]=~~e;break;case"a":case"A":n._isPm=_(n._l).isPM(e);break;case"H":case"HH":case"h":case"hh":i[3]=~~e;break;case"m":case"mm":i[4]=~~e;break;case"s":case"ss":i[5]=~~e;break;case"S":case"SS":case"SSS":i[6]=~~(1e3*("0."+e));break;case"X":n._d=new Date(1e3*parseFloat(e));break;case"Z":case"ZZ":n._useUTC=!0,n._tzm=p(e)}null==e&&(n._isValid=!1)}function Y(t){var e,n,s=[];if(!t._d){for(e=0;7>e;e++)t._a[e]=s[e]=null==t._a[e]?2===e?1:0:t._a[e];s[3]+=~~((t._tzm||0)/60),s[4]+=~~((t._tzm||0)%60),n=new Date(0),t._useUTC?(n.setUTCFullYear(s[0],s[1],s[2]),n.setUTCHours(s[3],s[4],s[5],s[6])):(n.setFullYear(s[0],s[1],s[2]),n.setHours(s[3],s[4],s[5],s[6])),t._d=n}}function w(t){var e,n,s=t._f.match(E),i=t._i;for(t._a=[],e=0;eo&&(u=o,s=n);a(t,s)}function v(t){var e,n=t._i,s=K.exec(n);if(s){for(t._f="YYYY-MM-DD"+(s[2]||" "),e=0;4>e;e++)if(te[e][1].exec(n)){t._f+=te[e][0];break}j.exec(n)&&(t._f+=" Z"),w(t)}else t._d=new Date(n)}function T(e){var n=e._i,s=G.exec(n);n===t?e._d=new Date:s?e._d=new Date(+s[1]):"string"==typeof n?v(e):d(n)?(e._a=n.slice(0),Y(e)):e._d=n instanceof Date?new Date(+n):new Date(n)}function b(t,e,n,s,i){return i.relativeTime(e||1,!!n,t,s)}function S(t,e,n){var s=W(Math.abs(t)/1e3),i=W(s/60),r=W(i/60),a=W(r/24),o=W(a/365),u=45>s&&["s",s]||1===i&&["m"]||45>i&&["mm",i]||1===r&&["h"]||22>r&&["hh",r]||1===a&&["d"]||25>=a&&["dd",a]||45>=a&&["M"]||345>a&&["MM",W(a/30)]||1===o&&["y"]||["yy",o];return u[2]=e,u[3]=t>0,u[4]=n,b.apply({},u)}function F(t,e,n){var s,i=n-e,r=n-t.day();return r>i&&(r-=7),i-7>r&&(r+=7),s=H(t).add("d",r),{week:Math.ceil(s.dayOfYear()/7),year:s.year()}}function O(t){var e=t._i,n=t._f;return null===e||""===e?null:("string"==typeof e&&(t._i=e=_().preparse(e)),H.isMoment(e)?(t=a({},e),t._d=new Date(+e._d)):n?d(n)?k(t):w(t):T(t),new i(t))}function z(t,e){H.fn[t]=H.fn[t+"s"]=function(t){var n=this._isUTC?"UTC":"";return null!=t?(this._d["set"+n+e](t),H.updateOffset(this),this):this._d["get"+n+e]()}}function C(t){H.duration.fn[t]=function(){return this._data[t]}}function L(t,e){H.duration.fn["as"+t]=function(){return+this/e}}for(var H,P,U="2.1.0",W=Math.round,x={},A="undefined"!=typeof module&&module.exports,G=/^\/?Date\((\-?\d+)/i,Z=/(\-)?(\d*)?\.?(\d+)\:(\d+)\:(\d+)\.?(\d{3})?/,E=/(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|SS?S?|X|zz?|ZZ?|.)/g,N=/(\[[^\[]*\])|(\\)?(LT|LL?L?L?|l{1,4})/g,J=/\d\d?/,I=/\d{1,3}/,V=/\d{3}/,X=/\d{1,4}/,$=/[+\-]?\d{1,6}/,R=/[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF\/]+(\s*?[\u0600-\u06FF]+){1,2}/i,j=/Z|[\+\-]\d\d:?\d\d/i,q=/T/i,B=/[\+\-]?\d+(\.\d{1,3})?/,K=/^\s*\d{4}-\d\d-\d\d((T| )(\d\d(:\d\d(:\d\d(\.\d\d?\d?)?)?)?)?([\+\-]\d\d:?\d\d)?)?/,Q="YYYY-MM-DDTHH:mm:ssZ",te=[["HH:mm:ss.S",/(T| )\d\d:\d\d:\d\d\.\d{1,3}/],["HH:mm:ss",/(T| )\d\d:\d\d:\d\d/],["HH:mm",/(T| )\d\d:\d\d/],["HH",/(T| )\d\d/]],ee=/([\+\-]|\d\d)/gi,ne="Date|Hours|Minutes|Seconds|Milliseconds".split("|"),se={Milliseconds:1,Seconds:1e3,Minutes:6e4,Hours:36e5,Days:864e5,Months:2592e6,Years:31536e6},ie={ms:"millisecond",s:"second",m:"minute",h:"hour",d:"day",w:"week",M:"month",y:"year"},re={},ae="DDD w W M D d".split(" "),oe="M D H h m s w W".split(" "),ue={M:function(){return this.month()+1},MMM:function(t){return this.lang().monthsShort(this,t)},MMMM:function(t){return this.lang().months(this,t)},D:function(){return this.date()},DDD:function(){return this.dayOfYear()},d:function(){return this.day()},dd:function(t){return this.lang().weekdaysMin(this,t)},ddd:function(t){return this.lang().weekdaysShort(this,t)},dddd:function(t){return this.lang().weekdays(this,t)},w:function(){return this.week()},W:function(){return this.isoWeek()},YY:function(){return u(this.year()%100,2)},YYYY:function(){return u(this.year(),4)},YYYYY:function(){return u(this.year(),5)},gg:function(){return u(this.weekYear()%100,2)},gggg:function(){return this.weekYear()},ggggg:function(){return u(this.weekYear(),5)},GG:function(){return u(this.isoWeekYear()%100,2)},GGGG:function(){return this.isoWeekYear()},GGGGG:function(){return u(this.isoWeekYear(),5)},e:function(){return this.weekday()},E:function(){return this.isoWeekday()},a:function(){return this.lang().meridiem(this.hours(),this.minutes(),!0)},A:function(){return this.lang().meridiem(this.hours(),this.minutes(),!1)},H:function(){return this.hours()},h:function(){return this.hours()%12||12},m:function(){return this.minutes()},s:function(){return this.seconds()},S:function(){return~~(this.milliseconds()/100)},SS:function(){return u(~~(this.milliseconds()/10),2)},SSS:function(){return u(this.milliseconds(),3)},Z:function(){var t=-this.zone(),e="+";return 0>t&&(t=-t,e="-"),e+u(~~(t/60),2)+":"+u(~~t%60,2)},ZZ:function(){var t=-this.zone(),e="+";return 0>t&&(t=-t,e="-"),e+u(~~(10*t/6),4)},z:function(){return this.zoneAbbr()},zz:function(){return this.zoneName()},X:function(){return this.unix()}};ae.length;)P=ae.pop(),ue[P+"o"]=n(ue[P],P);for(;oe.length;)P=oe.pop(),ue[P+P]=e(ue[P],2);for(ue.DDDD=e(ue.DDD,3),s.prototype={set:function(t){var e,n;for(n in t)e=t[n],"function"==typeof e?this[n]=e:this["_"+n]=e},_months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),months:function(t){return this._months[t.month()]},_monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),monthsShort:function(t){return this._monthsShort[t.month()]},monthsParse:function(t){var e,n,s;for(this._monthsParse||(this._monthsParse=[]),e=0;12>e;e++)if(this._monthsParse[e]||(n=H([2e3,e]),s="^"+this.months(n,"")+"|^"+this.monthsShort(n,""),this._monthsParse[e]=new RegExp(s.replace(".",""),"i")),this._monthsParse[e].test(t))return e},_weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdays:function(t){return this._weekdays[t.day()]},_weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysShort:function(t){return this._weekdaysShort[t.day()]},_weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),weekdaysMin:function(t){return this._weekdaysMin[t.day()]},weekdaysParse:function(t){var e,n,s;for(this._weekdaysParse||(this._weekdaysParse=[]),e=0;7>e;e++)if(this._weekdaysParse[e]||(n=H([2e3,1]).day(e),s="^"+this.weekdays(n,"")+"|^"+this.weekdaysShort(n,"")+"|^"+this.weekdaysMin(n,""),this._weekdaysParse[e]=new RegExp(s.replace(".",""),"i")),this._weekdaysParse[e].test(t))return e},_longDateFormat:{LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D YYYY",LLL:"MMMM D YYYY LT",LLLL:"dddd, MMMM D YYYY LT"},longDateFormat:function(t){var e=this._longDateFormat[t];return!e&&this._longDateFormat[t.toUpperCase()]&&(e=this._longDateFormat[t.toUpperCase()].replace(/MMMM|MM|DD|dddd/g,function(t){return t.slice(1)}),this._longDateFormat[t]=e),e},isPM:function(t){return"p"===(t+"").toLowerCase()[0]},_meridiemParse:/[ap]\.?m?\.?/i,meridiem:function(t,e,n){return t>11?n?"pm":"PM":n?"am":"AM"},_calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},calendar:function(t,e){var n=this._calendar[t];return"function"==typeof n?n.apply(e):n},_relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},relativeTime:function(t,e,n,s){var i=this._relativeTime[n];return"function"==typeof i?i(t,e,n,s):i.replace(/%d/i,t)},pastFuture:function(t,e){var n=this._relativeTime[t>0?"future":"past"];return"function"==typeof n?n(e):n.replace(/%s/i,e)},ordinal:function(t){return this._ordinal.replace("%d",t)},_ordinal:"%d",preparse:function(t){return t},postformat:function(t){return t},week:function(t){return F(t,this._week.dow,this._week.doy).week},_week:{dow:0,doy:6}},H=function(t,e,n){return O({_i:t,_f:e,_l:n,_isUTC:!1})},H.utc=function(t,e,n){return O({_useUTC:!0,_isUTC:!0,_l:n,_i:t,_f:e})},H.unix=function(t){return H(1e3*t)},H.duration=function(t,e){var n,s,i=H.isDuration(t),a="number"==typeof t,o=i?t._input:a?{}:t,u=Z.exec(t);return a?e?o[e]=t:o.milliseconds=t:u&&(n="-"===u[1]?-1:1,o={y:0,d:~~u[2]*n,h:~~u[3]*n,m:~~u[4]*n,s:~~u[5]*n,ms:~~u[6]*n}),s=new r(o),i&&t.hasOwnProperty("_lang")&&(s._lang=t._lang),s},H.version=U,H.defaultFormat=Q,H.updateOffset=function(){},H.lang=function(t,e){return t?(e?l(t,e):x[t]||_(t),H.duration.fn._lang=H.fn._lang=_(t),void 0):H.fn._lang._abbr},H.langData=function(t){return t&&t._lang&&t._lang._abbr&&(t=t._lang._abbr),_(t)},H.isMoment=function(t){return t instanceof i},H.isDuration=function(t){return t instanceof r},H.fn=i.prototype={clone:function(){return H(this)},valueOf:function(){return+this._d+6e4*(this._offset||0)},unix:function(){return Math.floor(+this/1e3)},toString:function(){return this.format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")},toDate:function(){return this._offset?new Date(+this):this._d},toISOString:function(){return M(H(this).utc(),"YYYY-MM-DD[T]HH:mm:ss.SSS[Z]")},toArray:function(){var t=this;return[t.year(),t.month(),t.date(),t.hours(),t.minutes(),t.seconds(),t.milliseconds()]},isValid:function(){return null==this._isValid&&(this._isValid=this._a?!c(this._a,(this._isUTC?H.utc(this._a):H(this._a)).toArray()):!isNaN(this._d.getTime())),!!this._isValid},utc:function(){return this.zone(0)},local:function(){return this.zone(0),this._isUTC=!1,this},format:function(t){var e=M(this,t||H.defaultFormat);return this.lang().postformat(e)},add:function(t,e){var n;return n="string"==typeof t?H.duration(+e,t):H.duration(t,e),h(this,n,1),this},subtract:function(t,e){var n;return n="string"==typeof t?H.duration(+e,t):H.duration(t,e),h(this,n,-1),this},diff:function(t,e,n){var s,i,r=this._isUTC?H(t).zone(this._offset||0):H(t).local(),a=6e4*(this.zone()-r.zone());return e=f(e),"year"===e||"month"===e?(s=432e5*(this.daysInMonth()+r.daysInMonth()),i=12*(this.year()-r.year())+(this.month()-r.month()),i+=(this-H(this).startOf("month")-(r-H(r).startOf("month")))/s,i-=6e4*(this.zone()-H(this).startOf("month").zone()-(r.zone()-H(r).startOf("month").zone()))/s,"year"===e&&(i/=12)):(s=this-r,i="second"===e?s/1e3:"minute"===e?s/6e4:"hour"===e?s/36e5:"day"===e?(s-a)/864e5:"week"===e?(s-a)/6048e5:s),n?i:o(i)},from:function(t,e){return H.duration(this.diff(t)).lang(this.lang()._abbr).humanize(!e)},fromNow:function(t){return this.from(H(),t)},calendar:function(){var t=this.diff(H().startOf("day"),"days",!0),e=-6>t?"sameElse":-1>t?"lastWeek":0>t?"lastDay":1>t?"sameDay":2>t?"nextDay":7>t?"nextWeek":"sameElse";return this.format(this.lang().calendar(e,this))},isLeapYear:function(){var t=this.year();return 0===t%4&&0!==t%100||0===t%400},isDST:function(){return this.zone()+H(t).startOf(e)},isBefore:function(t,e){return e="undefined"!=typeof e?e:"millisecond",+this.clone().startOf(e)<+H(t).startOf(e)},isSame:function(t,e){return e="undefined"!=typeof e?e:"millisecond",+this.clone().startOf(e)===+H(t).startOf(e)},min:function(t){return t=H.apply(null,arguments),this>t?this:t},max:function(t){return t=H.apply(null,arguments),t>this?this:t},zone:function(t){var e=this._offset||0;return null==t?this._isUTC?e:this._d.getTimezoneOffset():("string"==typeof t&&(t=p(t)),Math.abs(t)<16&&(t=60*t),this._offset=t,this._isUTC=!0,e!==t&&h(this,H.duration(e-t,"m"),1,!0),this)},zoneAbbr:function(){return this._isUTC?"UTC":""},zoneName:function(){return this._isUTC?"Coordinated Universal Time":""},daysInMonth:function(){return H.utc([this.year(),this.month()+1,0]).date()},dayOfYear:function(t){var e=W((H(this).startOf("day")-H(this).startOf("year"))/864e5)+1;return null==t?e:this.add("d",t-e)},weekYear:function(t){var e=F(this,this.lang()._week.dow,this.lang()._week.doy).year;return null==t?e:this.add("y",t-e)},isoWeekYear:function(t){var e=F(this,1,4).year;return null==t?e:this.add("y",t-e)},week:function(t){var e=this.lang().week(this);return null==t?e:this.add("d",7*(t-e))},isoWeek:function(t){var e=F(this,1,4).week;return null==t?e:this.add("d",7*(t-e))},weekday:function(t){var e=(this._d.getDay()+7-this.lang()._week.dow)%7;return null==t?e:this.add("d",t-e)},isoWeekday:function(t){return null==t?this.day()||7:this.day(this.day()%7?t:t-7)},lang:function(e){return e===t?this._lang:(this._lang=_(e),this)}},P=0;P

    ' + - '
    ' + + '
    ' + + '
    ' + '
    ' + '
    ' + - '
    ' + - '' + - '' + + '
    ' + + '' + + '' + '
    ' + - '
    ' + - '' + - '' + + '
    ' + + '' + + '' + '
    ' + - ' ' + - '' + + ' ' + + '' + '
    ' + '
    ' + '
    '; - this.parentEl = (hasOptions && options.parentEl && $(options.parentEl)) || $(this.parentEl); - //the date range picker + //custom options + if (typeof options !== 'object' || options === null) + options = {}; + + this.parentEl = (typeof options === 'object' && options.parentEl && $(options.parentEl).length) ? $(options.parentEl) : $(this.parentEl); this.container = $(DRPTemplate).appendTo(this.parentEl); - if (hasOptions) { + this.setOptions(options, cb); - if (typeof options.format == 'string') + //apply CSS classes and labels to buttons + var c = this.container; + $.each(this.buttonClasses, function (idx, val) { + c.find('button').addClass(val); + }); + this.container.find('.daterangepicker_start_input label').html(this.locale.fromLabel); + this.container.find('.daterangepicker_end_input label').html(this.locale.toLabel); + if (this.applyClass.length) + this.container.find('.applyBtn').addClass(this.applyClass); + if (this.cancelClass.length) + this.container.find('.cancelBtn').addClass(this.cancelClass); + this.container.find('.applyBtn').html(this.locale.applyLabel); + this.container.find('.cancelBtn').html(this.locale.cancelLabel); + + //event listeners + + this.container.find('.calendar') + .on('click.daterangepicker', '.prev', $.proxy(this.clickPrev, this)) + .on('click.daterangepicker', '.next', $.proxy(this.clickNext, this)) + .on('click.daterangepicker', 'td.available', $.proxy(this.clickDate, this)) + .on('mouseenter.daterangepicker', 'td.available', $.proxy(this.hoverDate, this)) + .on('mouseleave.daterangepicker', 'td.available', $.proxy(this.updateFormInputs, this)) + .on('change.daterangepicker', 'select.yearselect', $.proxy(this.updateMonthYear, this)) + .on('change.daterangepicker', 'select.monthselect', $.proxy(this.updateMonthYear, this)) + .on('change.daterangepicker', 'select.hourselect,select.minuteselect,select.secondselect,select.ampmselect', $.proxy(this.updateTime, this)); + + this.container.find('.ranges') + .on('click.daterangepicker', 'button.applyBtn', $.proxy(this.clickApply, this)) + .on('click.daterangepicker', 'button.cancelBtn', $.proxy(this.clickCancel, this)) + .on('click.daterangepicker', '.daterangepicker_start_input,.daterangepicker_end_input', $.proxy(this.showCalendars, this)) + .on('change.daterangepicker', '.daterangepicker_start_input,.daterangepicker_end_input', $.proxy(this.inputsChanged, this)) + .on('keydown.daterangepicker', '.daterangepicker_start_input,.daterangepicker_end_input', $.proxy(this.inputsKeydown, this)) + .on('click.daterangepicker', 'li', $.proxy(this.clickRange, this)) + .on('mouseenter.daterangepicker', 'li', $.proxy(this.enterRange, this)) + .on('mouseleave.daterangepicker', 'li', $.proxy(this.updateFormInputs, this)); + + if (this.element.is('input')) { + this.element.on({ + 'click.daterangepicker': $.proxy(this.show, this), + 'focus.daterangepicker': $.proxy(this.show, this), + 'keyup.daterangepicker': $.proxy(this.updateFromControl, this) + }); + } else { + this.element.on('click.daterangepicker', $.proxy(this.toggle, this)); + } + + }; + + DateRangePicker.prototype = { + + constructor: DateRangePicker, + + setOptions: function(options, callback) { + + this.startDate = moment().startOf('day'); + this.endDate = moment().endOf('day'); + this.timeZone = moment().zone(); + this.minDate = false; + this.maxDate = false; + this.dateLimit = false; + + this.showDropdowns = false; + this.showWeekNumbers = false; + this.timePicker = false; + this.timePickerSeconds = false; + this.timePickerIncrement = 30; + this.timePicker12Hour = true; + this.singleDatePicker = false; + this.ranges = {}; + + this.opens = 'right'; + if (this.element.hasClass('pull-right')) + this.opens = 'left'; + + this.buttonClasses = ['btn', 'btn-small btn-sm']; + this.applyClass = 'btn-success'; + this.cancelClass = 'btn-default'; + + this.format = 'MM/DD/YYYY'; + this.separator = ' - '; + + this.locale = { + applyLabel: 'Apply', + cancelLabel: 'Cancel', + fromLabel: 'From', + toLabel: 'To', + weekLabel: 'W', + customRangeLabel: 'Custom Range', + daysOfWeek: moment.weekdaysMin(), + monthNames: moment.monthsShort(), + firstDay: moment.localeData()._week.dow + }; + + this.cb = function () { }; + + if (typeof options.format === 'string') this.format = options.format; - if (typeof options.separator == 'string') + if (typeof options.separator === 'string') this.separator = options.separator; - if (typeof options.startDate == 'string') + if (typeof options.startDate === 'string') this.startDate = moment(options.startDate, this.format); - if (typeof options.endDate == 'string') + if (typeof options.endDate === 'string') this.endDate = moment(options.endDate, this.format); - if (typeof options.minDate == 'string') + if (typeof options.minDate === 'string') this.minDate = moment(options.minDate, this.format); - if (typeof options.maxDate == 'string') + if (typeof options.maxDate === 'string') this.maxDate = moment(options.maxDate, this.format); - if (typeof options.startDate == 'object') + if (typeof options.startDate === 'object') this.startDate = moment(options.startDate); - if (typeof options.endDate == 'object') + if (typeof options.endDate === 'object') this.endDate = moment(options.endDate); - if (typeof options.minDate == 'object') + if (typeof options.minDate === 'object') this.minDate = moment(options.minDate); - if (typeof options.maxDate == 'object') + if (typeof options.maxDate === 'object') this.maxDate = moment(options.maxDate); - if (typeof options.ranges == 'object') { - for (var range in options.ranges) { + if (typeof options.applyClass === 'string') + this.applyClass = options.applyClass; - var start = moment(options.ranges[range][0]); - var end = moment(options.ranges[range][1]); + if (typeof options.cancelClass === 'string') + this.cancelClass = options.cancelClass; + + if (typeof options.dateLimit === 'object') + this.dateLimit = options.dateLimit; + + if (typeof options.locale === 'object') { + + if (typeof options.locale.daysOfWeek === 'object') { + // Create a copy of daysOfWeek to avoid modification of original + // options object for reusability in multiple daterangepicker instances + this.locale.daysOfWeek = options.locale.daysOfWeek.slice(); + } + + if (typeof options.locale.monthNames === 'object') { + this.locale.monthNames = options.locale.monthNames.slice(); + } + + if (typeof options.locale.firstDay === 'number') { + this.locale.firstDay = options.locale.firstDay; + } + + if (typeof options.locale.applyLabel === 'string') { + this.locale.applyLabel = options.locale.applyLabel; + } + + if (typeof options.locale.cancelLabel === 'string') { + this.locale.cancelLabel = options.locale.cancelLabel; + } + + if (typeof options.locale.fromLabel === 'string') { + this.locale.fromLabel = options.locale.fromLabel; + } + + if (typeof options.locale.toLabel === 'string') { + this.locale.toLabel = options.locale.toLabel; + } + + if (typeof options.locale.weekLabel === 'string') { + this.locale.weekLabel = options.locale.weekLabel; + } + + if (typeof options.locale.customRangeLabel === 'string') { + this.locale.customRangeLabel = options.locale.customRangeLabel; + } + } + + if (typeof options.opens === 'string') + this.opens = options.opens; + + if (typeof options.showWeekNumbers === 'boolean') { + this.showWeekNumbers = options.showWeekNumbers; + } + + if (typeof options.buttonClasses === 'string') { + this.buttonClasses = [options.buttonClasses]; + } + + if (typeof options.buttonClasses === 'object') { + this.buttonClasses = options.buttonClasses; + } + + if (typeof options.showDropdowns === 'boolean') { + this.showDropdowns = options.showDropdowns; + } + + if (typeof options.singleDatePicker === 'boolean') { + this.singleDatePicker = options.singleDatePicker; + if (this.singleDatePicker) { + this.endDate = this.startDate.clone(); + } + } + + if (typeof options.timePicker === 'boolean') { + this.timePicker = options.timePicker; + } + + if (typeof options.timePickerSeconds === 'boolean') { + this.timePickerSeconds = options.timePickerSeconds; + } + + if (typeof options.timePickerIncrement === 'number') { + this.timePickerIncrement = options.timePickerIncrement; + } + + if (typeof options.timePicker12Hour === 'boolean') { + this.timePicker12Hour = options.timePicker12Hour; + } + + // update day names order to firstDay + if (this.locale.firstDay != 0) { + var iterator = this.locale.firstDay; + while (iterator > 0) { + this.locale.daysOfWeek.push(this.locale.daysOfWeek.shift()); + iterator--; + } + } + + var start, end, range; + + //if no start/end dates set, check if an input element contains initial values + if (typeof options.startDate === 'undefined' && typeof options.endDate === 'undefined') { + if ($(this.element).is('input[type=text]')) { + var val = $(this.element).val(), + split = val.split(this.separator); + + start = end = null; + + if (split.length == 2) { + start = moment(split[0], this.format); + end = moment(split[1], this.format); + } else if (this.singleDatePicker && val !== "") { + start = moment(val, this.format); + end = moment(val, this.format); + } + if (start !== null && end !== null) { + this.startDate = start; + this.endDate = end; + } + } + } + + // bind the time zone used to build the calendar to either the timeZone passed in through the options or the zone of the startDate (which will be the local time zone by default) + if (typeof options.timeZone === 'string' || typeof options.timeZone === 'number') { + this.timeZone = options.timeZone; + this.startDate.zone(this.timeZone); + this.endDate.zone(this.timeZone); + } else { + this.timeZone = moment(this.startDate).zone(); + } + + if (typeof options.ranges === 'object') { + for (range in options.ranges) { + + if (typeof options.ranges[range][0] === 'string') + start = moment(options.ranges[range][0], this.format); + else + start = moment(options.ranges[range][0]); + + if (typeof options.ranges[range][1] === 'string') + end = moment(options.ranges[range][1], this.format); + else + end = moment(options.ranges[range][1]); // If we have a min/max date set, bound this range // to it, but only if it would otherwise fall @@ -173,169 +365,123 @@ } var list = '
      '; - for (var range in this.ranges) { + for (range in this.ranges) { list += '
    • ' + range + '
      • '; } list += '
    • ' + this.locale.customRangeLabel + '
      • '; list += '
    '; + this.container.find('.ranges ul').remove(); this.container.find('.ranges').prepend(list); } - if (typeof options.dateLimit == 'object') - this.dateLimit = options.dateLimit; + if (typeof callback === 'function') { + this.cb = callback; + } - // update day names order to firstDay - if (typeof options.locale == 'object') { + if (!this.timePicker) { + this.startDate = this.startDate.startOf('day'); + this.endDate = this.endDate.endOf('day'); + } - if (typeof options.locale.daysOfWeek == 'object') { + if (this.singleDatePicker) { + this.opens = 'right'; + this.container.addClass('single'); + this.container.find('.calendar.right').show(); + this.container.find('.calendar.left').hide(); + if (!this.timePicker) { + this.container.find('.ranges').hide(); + } else { + this.container.find('.ranges .daterangepicker_start_input, .ranges .daterangepicker_end_input').hide(); + } + if (!this.container.find('.calendar.right').hasClass('single')) + this.container.find('.calendar.right').addClass('single'); + } else { + this.container.removeClass('single'); + this.container.find('.calendar.right').removeClass('single'); + this.container.find('.ranges').show(); + } - // Create a copy of daysOfWeek to avoid modification of original - // options object for reusability in multiple daterangepicker instances - this.locale.daysOfWeek = options.locale.daysOfWeek.slice(); + this.oldStartDate = this.startDate.clone(); + this.oldEndDate = this.endDate.clone(); + this.oldChosenLabel = this.chosenLabel; + + this.leftCalendar = { + month: moment([this.startDate.year(), this.startDate.month(), 1, this.startDate.hour(), this.startDate.minute(), this.startDate.second()]), + calendar: [] + }; + + this.rightCalendar = { + month: moment([this.endDate.year(), this.endDate.month(), 1, this.endDate.hour(), this.endDate.minute(), this.endDate.second()]), + calendar: [] + }; + + if (this.opens == 'right' || this.opens == 'center') { + //swap calendar positions + var first = this.container.find('.calendar.first'); + var second = this.container.find('.calendar.second'); + + if (second.hasClass('single')) { + second.removeClass('single'); + first.addClass('single'); } - if (typeof options.locale.firstDay == 'number') { - this.locale.firstDay = options.locale.firstDay; - var iterator = options.locale.firstDay; - while (iterator > 0) { - this.locale.daysOfWeek.push(this.locale.daysOfWeek.shift()); - iterator--; - } + first.removeClass('left').addClass('right'); + second.removeClass('right').addClass('left'); + + if (this.singleDatePicker) { + first.show(); + second.hide(); } } - if (typeof options.opens == 'string') - this.opens = options.opens; - - if (typeof options.showWeekNumbers == 'boolean') { - this.showWeekNumbers = options.showWeekNumbers; + if (typeof options.ranges === 'undefined' && !this.singleDatePicker) { + this.container.addClass('show-calendar'); } - if (typeof options.buttonClasses == 'string') { - this.buttonClasses = [options.buttonClasses]; - } + this.container.addClass('opens' + this.opens); - if (typeof options.buttonClasses == 'object') { - this.buttonClasses = options.buttonClasses; - } + this.updateView(); + this.updateCalendars(); - if (typeof options.showDropdowns == 'boolean') { - this.showDropdowns = options.showDropdowns; - } + }, - if (typeof options.timePicker == 'boolean') { - this.timePicker = options.timePicker; - } + setStartDate: function(startDate) { + if (typeof startDate === 'string') + this.startDate = moment(startDate, this.format).zone(this.timeZone); - if (typeof options.timePickerIncrement == 'number') { - this.timePickerIncrement = options.timePickerIncrement; - } + if (typeof startDate === 'object') + this.startDate = moment(startDate); - if (typeof options.timePicker12Hour == 'boolean') { - this.timePicker12Hour = options.timePicker12Hour; - } + if (!this.timePicker) + this.startDate = this.startDate.startOf('day'); - } + this.oldStartDate = this.startDate.clone(); - if (!this.timePicker) { - this.startDate = this.startDate.startOf('day'); - this.endDate = this.endDate.startOf('day'); - } + this.updateView(); + this.updateCalendars(); + this.updateInputText(); + }, - //apply CSS classes to buttons - var c = this.container; - $.each(this.buttonClasses, function (idx, val) { - c.find('button').addClass(val); - }); + setEndDate: function(endDate) { + if (typeof endDate === 'string') + this.endDate = moment(endDate, this.format).zone(this.timeZone); - if (this.opens == 'right') { - //swap calendar positions - var left = this.container.find('.calendar.left'); - var right = this.container.find('.calendar.right'); - left.removeClass('left').addClass('right'); - right.removeClass('right').addClass('left'); - } + if (typeof endDate === 'object') + this.endDate = moment(endDate); - if (typeof options == 'undefined' || typeof options.ranges == 'undefined') { - this.container.find('.calendar').show(); - this.move(); - } + if (!this.timePicker) + this.endDate = this.endDate.endOf('day'); - if (typeof cb == 'function') - this.cb = cb; + this.oldEndDate = this.endDate.clone(); - this.container.addClass('opens' + this.opens); - - //try parse date if in text input - if (!hasOptions || (typeof options.startDate == 'undefined' && typeof options.endDate == 'undefined')) { - if ($(this.element).is('input[type=text]')) { - var val = $(this.element).val(); - var split = val.split(this.separator); - var start, end; - if (split.length == 2) { - start = moment(split[0], this.format); - end = moment(split[1], this.format); - } - if (start != null && end != null) { - this.startDate = start; - this.endDate = end; - } - } - } - - //state - this.oldStartDate = this.startDate.clone(); - this.oldEndDate = this.endDate.clone(); - - this.leftCalendar = { - month: moment([this.startDate.year(), this.startDate.month(), 1, this.startDate.hour(), this.startDate.minute()]), - calendar: [] - }; - - this.rightCalendar = { - month: moment([this.endDate.year(), this.endDate.month(), 1, this.endDate.hour(), this.endDate.minute()]), - calendar: [] - }; - - //event listeners - this.container.on('mousedown', $.proxy(this.mousedown, this)); - - this.container.find('.calendar') - .on('click', '.prev', $.proxy(this.clickPrev, this)) - .on('click', '.next', $.proxy(this.clickNext, this)) - .on('click', 'td.available', $.proxy(this.clickDate, this)) - .on('mouseenter', 'td.available', $.proxy(this.enterDate, this)) - .on('mouseleave', 'td.available', $.proxy(this.updateFormInputs, this)) - .on('change', 'select.yearselect', $.proxy(this.updateMonthYear, this)) - .on('change', 'select.monthselect', $.proxy(this.updateMonthYear, this)) - .on('change', 'select.hourselect,select.minuteselect,select.ampmselect', $.proxy(this.updateTime, this)); - - this.container.find('.ranges') - .on('click', 'button.applyBtn', $.proxy(this.clickApply, this)) - .on('click', 'button.cancelBtn', $.proxy(this.clickCancel, this)) - .on('click', '.daterangepicker_start_input,.daterangepicker_end_input', $.proxy(this.showCalendars, this)) - .on('click', 'li', $.proxy(this.clickRange, this)) - .on('mouseenter', 'li', $.proxy(this.enterRange, this)) - .on('mouseleave', 'li', $.proxy(this.updateFormInputs, this)); - - this.element.on('keyup', $.proxy(this.updateFromControl, this)); - - this.updateView(); - this.updateCalendars(); - - }; - - DateRangePicker.prototype = { - - constructor: DateRangePicker, - - mousedown: function (e) { - e.stopPropagation(); + this.updateView(); + this.updateCalendars(); + this.updateInputText(); }, updateView: function () { - this.leftCalendar.month.month(this.startDate.month()).year(this.startDate.year()); - this.rightCalendar.month.month(this.endDate.month()).year(this.endDate.year()); + this.leftCalendar.month.month(this.startDate.month()).year(this.startDate.year()).hour(this.startDate.hour()).minute(this.startDate.minute()); + this.rightCalendar.month.month(this.endDate.month()).year(this.endDate.year()).hour(this.endDate.hour()).minute(this.endDate.minute()); this.updateFormInputs(); }, @@ -354,11 +500,20 @@ if (!this.element.is('input')) return; if (!this.element.val().length) return; - var dateString = this.element.val().split(this.separator); - var start = moment(dateString[0], this.format); - var end = moment(dateString[1], this.format); + var dateString = this.element.val().split(this.separator), + start = null, + end = null; + + if(dateString.length === 2) { + start = moment(dateString[0], this.format).zone(this.timeZone); + end = moment(dateString[1], this.format).zone(this.timeZone); + } + + if (this.singleDatePicker || start === null || end === null) { + start = moment(this.element.val(), this.format).zone(this.timeZone); + end = start; + } - if (start == null || end == null) return; if (end.isBefore(start)) return; this.oldStartDate = this.startDate.clone(); @@ -375,18 +530,24 @@ notify: function () { this.updateView(); - this.cb(this.startDate, this.endDate); + this.cb(this.startDate, this.endDate, this.chosenLabel); }, move: function () { - var parentOffset = { - top: this.parentEl.offset().top - (this.parentEl.is('body') ? 0 : this.parentEl.scrollTop()), - left: this.parentEl.offset().left - (this.parentEl.is('body') ? 0 : this.parentEl.scrollLeft()) - }; + var parentOffset = { top: 0, left: 0 }; + var parentRightEdge = $(window).width(); + if (!this.parentEl.is('body')) { + parentOffset = { + top: this.parentEl.offset().top - this.parentEl.scrollTop(), + left: this.parentEl.offset().left - this.parentEl.scrollLeft() + }; + parentRightEdge = this.parentEl[0].clientWidth + this.parentEl.offset().left; + } + if (this.opens == 'left') { this.container.css({ top: this.element.offset().top + this.element.outerHeight() - parentOffset.top, - right: $(window).width() - this.element.offset().left - this.element.outerWidth() - parentOffset.left, + right: parentRightEdge - this.element.offset().left - this.element.outerWidth(), left: 'auto' }); if (this.container.offset().left < 0) { @@ -395,6 +556,19 @@ left: 9 }); } + } else if (this.opens == 'center') { + this.container.css({ + top: this.element.offset().top + this.element.outerHeight() - parentOffset.top, + left: this.element.offset().left - parentOffset.left + this.element.outerWidth() / 2 + - this.container.outerWidth() / 2, + right: 'auto' + }); + if (this.container.offset().left < 0) { + this.container.css({ + right: 'auto', + left: 9 + }); + } } else { this.container.css({ top: this.element.offset().top + this.element.outerHeight() - parentOffset.top, @@ -410,20 +584,58 @@ } }, + toggle: function (e) { + if (this.element.hasClass('active')) { + this.hide(); + } else { + this.show(); + } + }, + show: function (e) { + if (this.isShowing) return; + + this.element.addClass('active'); this.container.show(); this.move(); - if (e) { - e.stopPropagation(); - e.preventDefault(); - } + // Create a click proxy that is private to this instance of datepicker, for unbinding + this._outsideClickProxy = $.proxy(function (e) { this.outsideClick(e); }, this); + // Bind global datepicker mousedown for hiding and + $(document) + .on('mousedown.daterangepicker', this._outsideClickProxy) + // also support mobile devices + .on('touchend.daterangepicker', this._outsideClickProxy) + // also explicitly play nice with Bootstrap dropdowns, which stopPropagation when clicking them + .on('click.daterangepicker', '[data-toggle=dropdown]', this._outsideClickProxy) + // and also close when focus changes to outside the picker (eg. tabbing between controls) + .on('focusin.daterangepicker', this._outsideClickProxy); - $(document).on('mousedown', $.proxy(this.hide, this)); - this.element.trigger('shown', {target: e.target, picker: this}); + this.isShowing = true; + this.element.trigger('show.daterangepicker', this); + }, + + outsideClick: function (e) { + var target = $(e.target); + // if the page is clicked anywhere except within the daterangerpicker/button + // itself then call this.hide() + if ( + // ie modal dialog fix + e.type == "focusin" || + target.closest(this.element).length || + target.closest(this.container).length || + target.closest('.calendar-date').length + ) return; + this.hide(); }, hide: function (e) { + if (!this.isShowing) return; + + $(document) + .off('.daterangepicker'); + + this.element.removeClass('active'); this.container.hide(); if (!this.startDate.isSame(this.oldStartDate) || !this.endDate.isSame(this.oldEndDate)) @@ -432,11 +644,12 @@ this.oldStartDate = this.startDate.clone(); this.oldEndDate = this.endDate.clone(); - $(document).off('mousedown', this.hide); - this.element.trigger('hidden', { picker: this }); + this.isShowing = false; + this.element.trigger('hide.daterangepicker', this); }, enterRange: function (e) { + // mouse pointer has entered a range label var label = e.target.innerHTML; if (label == this.locale.customRangeLabel) { this.updateView(); @@ -448,17 +661,51 @@ }, showCalendars: function() { - this.container.find('.calendar').show(); + this.container.addClass('show-calendar'); this.move(); + this.element.trigger('showCalendar.daterangepicker', this); + }, + + hideCalendars: function() { + this.container.removeClass('show-calendar'); + this.element.trigger('hideCalendar.daterangepicker', this); + }, + + // when a date is typed into the start to end date textboxes + inputsChanged: function (e) { + var el = $(e.target); + var date = moment(el.val(), this.format); + if (!date.isValid()) return; + + var startDate, endDate; + if (el.attr('name') === 'daterangepicker_start') { + startDate = date; + endDate = this.endDate; + } else { + startDate = this.startDate; + endDate = date; + } + this.setCustomDates(startDate, endDate); + }, + + inputsKeydown: function(e) { + if (e.keyCode === 13) { + this.inputsChanged(e); + this.notify(); + } }, updateInputText: function() { - if (this.element.is('input')) + if (this.element.is('input') && !this.singleDatePicker) { this.element.val(this.startDate.format(this.format) + this.separator + this.endDate.format(this.format)); + } else if (this.element.is('input')) { + this.element.val(this.endDate.format(this.format)); + } }, clickRange: function (e) { var label = e.target.innerHTML; + this.chosenLabel = label; if (label == this.locale.customRangeLabel) { this.showCalendars(); } else { @@ -469,7 +716,7 @@ if (!this.timePicker) { this.startDate.startOf('day'); - this.endDate.startOf('day'); + this.endDate.endOf('day'); } this.leftCalendar.month.month(this.startDate.month()).year(this.startDate.year()).hour(this.startDate.hour()).minute(this.startDate.minute()); @@ -478,17 +725,18 @@ this.updateInputText(); - this.container.find('.calendar').hide(); + this.hideCalendars(); this.hide(); + this.element.trigger('apply.daterangepicker', this); } }, clickPrev: function (e) { var cal = $(e.target).parents('.calendar'); if (cal.hasClass('left')) { - this.leftCalendar.month.subtract('month', 1); + this.leftCalendar.month.subtract(1, 'month'); } else { - this.rightCalendar.month.subtract('month', 1); + this.rightCalendar.month.subtract(1, 'month'); } this.updateCalendars(); }, @@ -496,15 +744,14 @@ clickNext: function (e) { var cal = $(e.target).parents('.calendar'); if (cal.hasClass('left')) { - this.leftCalendar.month.add('month', 1); + this.leftCalendar.month.add(1, 'month'); } else { - this.rightCalendar.month.add('month', 1); + this.rightCalendar.month.add(1, 'month'); } this.updateCalendars(); }, - enterDate: function (e) { - + hoverDate: function (e) { var title = $(e.target).attr('data-title'); var row = title.substr(1, 1); var col = title.substr(3, 1); @@ -515,7 +762,19 @@ } else { this.container.find('input[name=daterangepicker_end]').val(this.rightCalendar.calendar[row][col].format(this.format)); } + }, + setCustomDates: function(startDate, endDate) { + this.chosenLabel = this.locale.customRangeLabel; + if (startDate.isAfter(endDate)) { + var difference = this.endDate.diff(this.startDate); + endDate = moment(startDate).add(difference, 'ms'); + } + this.startDate = startDate; + this.endDate = endDate; + + this.updateView(); + this.updateCalendars(); }, clickDate: function (e) { @@ -524,19 +783,20 @@ var col = title.substr(3, 1); var cal = $(e.target).parents('.calendar'); + var startDate, endDate; if (cal.hasClass('left')) { - var startDate = this.leftCalendar.calendar[row][col]; - var endDate = this.endDate; - if (typeof this.dateLimit == 'object') { + startDate = this.leftCalendar.calendar[row][col]; + endDate = this.endDate; + if (typeof this.dateLimit === 'object') { var maxDate = moment(startDate).add(this.dateLimit).startOf('day'); if (endDate.isAfter(maxDate)) { endDate = maxDate; } } } else { - var startDate = this.startDate; - var endDate = this.rightCalendar.calendar[row][col]; - if (typeof this.dateLimit == 'object') { + startDate = this.startDate; + endDate = this.rightCalendar.calendar[row][col]; + if (typeof this.dateLimit === 'object') { var minDate = moment(endDate).subtract(this.dateLimit).startOf('day'); if (startDate.isBefore(minDate)) { startDate = minDate; @@ -544,72 +804,72 @@ } } - cal.find('td').removeClass('active'); - - if (startDate.isSame(endDate) || startDate.isBefore(endDate)) { - $(e.target).addClass('active'); - this.startDate = startDate; - this.endDate = endDate; - } else if (startDate.isAfter(endDate)) { - $(e.target).addClass('active'); - this.startDate = startDate; - this.endDate = moment(startDate).add('day', 1).startOf('day'); + if (this.singleDatePicker && cal.hasClass('left')) { + endDate = startDate.clone(); + } else if (this.singleDatePicker && cal.hasClass('right')) { + startDate = endDate.clone(); } - this.leftCalendar.month.month(this.startDate.month()).year(this.startDate.year()); - this.rightCalendar.month.month(this.endDate.month()).year(this.endDate.year()); - this.updateCalendars(); + cal.find('td').removeClass('active'); + + $(e.target).addClass('active'); + + this.setCustomDates(startDate, endDate); + + if (!this.timePicker) + endDate.endOf('day'); + + if (this.singleDatePicker && !this.timePicker) + this.clickApply(); }, clickApply: function (e) { this.updateInputText(); this.hide(); + this.element.trigger('apply.daterangepicker', this); }, clickCancel: function (e) { this.startDate = this.oldStartDate; this.endDate = this.oldEndDate; + this.chosenLabel = this.oldChosenLabel; this.updateView(); this.updateCalendars(); this.hide(); + this.element.trigger('cancel.daterangepicker', this); }, updateMonthYear: function (e) { - - var isLeft = $(e.target).closest('.calendar').hasClass('left'); - var cal = this.container.find('.calendar.left'); - if (!isLeft) - cal = this.container.find('.calendar.right'); + var isLeft = $(e.target).closest('.calendar').hasClass('left'), + leftOrRight = isLeft ? 'left' : 'right', + cal = this.container.find('.calendar.'+leftOrRight); // Month must be Number for new moment versions var month = parseInt(cal.find('.monthselect').val(), 10); var year = cal.find('.yearselect').val(); - if (isLeft) { - this.leftCalendar.month.month(month).year(year); - } else { - this.rightCalendar.month.month(month).year(year); - } - + this[leftOrRight+'Calendar'].month.month(month).year(year); this.updateCalendars(); - }, updateTime: function(e) { - var isLeft = $(e.target).closest('.calendar').hasClass('left'); - var cal = this.container.find('.calendar.left'); - if (!isLeft) - cal = this.container.find('.calendar.right'); + var cal = $(e.target).closest('.calendar'), + isLeft = cal.hasClass('left'); - var hour = parseInt(cal.find('.hourselect').val()); - var minute = parseInt(cal.find('.minuteselect').val()); + var hour = parseInt(cal.find('.hourselect').val(), 10); + var minute = parseInt(cal.find('.minuteselect').val(), 10); + var second = 0; + + if (this.timePickerSeconds) { + second = parseInt(cal.find('.secondselect').val(), 10); + } if (this.timePicker12Hour) { var ampm = cal.find('.ampmselect').val(); - if (ampm == 'PM' && hour < 12) + if (ampm === 'PM' && hour < 12) hour += 12; - if (ampm == 'AM' && hour == 12) + if (ampm === 'AM' && hour === 12) hour = 0; } @@ -617,25 +877,31 @@ var start = this.startDate.clone(); start.hour(hour); start.minute(minute); + start.second(second); this.startDate = start; - this.leftCalendar.month.hour(hour).minute(minute); + this.leftCalendar.month.hour(hour).minute(minute).second(second); + if (this.singleDatePicker) + this.endDate = start.clone(); } else { var end = this.endDate.clone(); end.hour(hour); end.minute(minute); + end.second(second); this.endDate = end; - this.rightCalendar.month.hour(hour).minute(minute); + if (this.singleDatePicker) + this.startDate = end.clone(); + this.rightCalendar.month.hour(hour).minute(minute).second(second); } + this.updateView(); this.updateCalendars(); - }, updateCalendars: function () { - this.leftCalendar.calendar = this.buildCalendar(this.leftCalendar.month.month(), this.leftCalendar.month.year(), this.leftCalendar.month.hour(), this.leftCalendar.month.minute(), 'left'); - this.rightCalendar.calendar = this.buildCalendar(this.rightCalendar.month.month(), this.rightCalendar.month.year(), this.rightCalendar.month.hour(), this.rightCalendar.month.minute(), 'right'); - this.container.find('.calendar.left').html(this.renderCalendar(this.leftCalendar.calendar, this.startDate, this.minDate, this.maxDate)); - this.container.find('.calendar.right').html(this.renderCalendar(this.rightCalendar.calendar, this.endDate, this.startDate, this.maxDate)); + this.leftCalendar.calendar = this.buildCalendar(this.leftCalendar.month.month(), this.leftCalendar.month.year(), this.leftCalendar.month.hour(), this.leftCalendar.month.minute(), this.leftCalendar.month.second(), 'left'); + this.rightCalendar.calendar = this.buildCalendar(this.rightCalendar.month.month(), this.rightCalendar.month.year(), this.rightCalendar.month.hour(), this.rightCalendar.month.minute(), this.rightCalendar.month.second(), 'right'); + this.container.find('.calendar.left').empty().html(this.renderCalendar(this.leftCalendar.calendar, this.startDate, this.minDate, this.maxDate, 'left')); + this.container.find('.calendar.right').empty().html(this.renderCalendar(this.rightCalendar.calendar, this.endDate, this.singleDatePicker ? this.minDate : this.startDate, this.maxDate, 'right')); this.container.find('.ranges li').removeClass('active'); var customRange = true; @@ -644,34 +910,44 @@ if (this.timePicker) { if (this.startDate.isSame(this.ranges[range][0]) && this.endDate.isSame(this.ranges[range][1])) { customRange = false; - this.container.find('.ranges li:eq(' + i + ')').addClass('active'); + this.chosenLabel = this.container.find('.ranges li:eq(' + i + ')') + .addClass('active').html(); } } else { //ignore times when comparing dates if time picker is not enabled if (this.startDate.format('YYYY-MM-DD') == this.ranges[range][0].format('YYYY-MM-DD') && this.endDate.format('YYYY-MM-DD') == this.ranges[range][1].format('YYYY-MM-DD')) { customRange = false; - this.container.find('.ranges li:eq(' + i + ')').addClass('active'); + this.chosenLabel = this.container.find('.ranges li:eq(' + i + ')') + .addClass('active').html(); } } i++; } - if (customRange) - this.container.find('.ranges li:last').addClass('active'); + if (customRange) { + this.chosenLabel = this.container.find('.ranges li:last').addClass('active').html(); + this.showCalendars(); + } }, - buildCalendar: function (month, year, hour, minute, side) { - + buildCalendar: function (month, year, hour, minute, second, side) { + var daysInMonth = moment([year, month]).daysInMonth(); var firstDay = moment([year, month, 1]); - var lastMonth = moment(firstDay).subtract('month', 1).month(); - var lastYear = moment(firstDay).subtract('month', 1).year(); + var lastDay = moment([year, month, daysInMonth]); + var lastMonth = moment(firstDay).subtract(1, 'month').month(); + var lastYear = moment(firstDay).subtract(1, 'month').year(); var daysInLastMonth = moment([lastYear, lastMonth]).daysInMonth(); var dayOfWeek = firstDay.day(); + var i; + //initialize a 6 rows x 7 columns array for the calendar var calendar = []; - for (var i = 0; i < 6; i++) { + calendar.firstDay = firstDay; + calendar.lastDay = lastDay; + + for (i = 0; i < 6; i++) { calendar[i] = []; } @@ -683,25 +959,39 @@ if (dayOfWeek == this.locale.firstDay) startDay = daysInLastMonth - 6; - var curDate = moment([lastYear, lastMonth, startDay, 12, minute]); - for (var i = 0, col = 0, row = 0; i < 42; i++, col++, curDate = moment(curDate).add('hour', 24)) { - if (i > 0 && col % 7 == 0) { + var curDate = moment([lastYear, lastMonth, startDay, 12, minute, second]).zone(this.timeZone); + + var col, row; + for (i = 0, col = 0, row = 0; i < 42; i++, col++, curDate = moment(curDate).add(24, 'hour')) { + if (i > 0 && col % 7 === 0) { col = 0; row++; } calendar[row][col] = curDate.clone().hour(hour); curDate.hour(12); + + if (this.minDate && calendar[row][col].format('YYYY-MM-DD') == this.minDate.format('YYYY-MM-DD') && calendar[row][col].isBefore(this.minDate) && side == 'left') { + calendar[row][col] = this.minDate.clone(); + } + + if (this.maxDate && calendar[row][col].format('YYYY-MM-DD') == this.maxDate.format('YYYY-MM-DD') && calendar[row][col].isAfter(this.maxDate) && side == 'right') { + calendar[row][col] = this.maxDate.clone(); + } + } return calendar; - }, renderDropdowns: function (selected, minDate, maxDate) { var currentMonth = selected.month(); + var currentYear = selected.year(); + var maxYear = (maxDate && maxDate.year()) || (currentYear + 5); + var minYear = (minDate && minDate.year()) || (currentYear - 50); + var monthHtml = '"; - var currentYear = selected.year(); - var maxYear = (maxDate && maxDate.year()) || (currentYear + 5); - var minYear = (minDate && minDate.year()) || (currentYear - 50); var yearHtml = ''; + + // Disallow selections before the minDate or after the maxDate + var min_hour = 0; + var max_hour = 23; + + if (minDate && (side == 'left' || this.singleDatePicker) && selected.format('YYYY-MM-DD') == minDate.format('YYYY-MM-DD')) { + min_hour = minDate.hour(); + if (selected.hour() < min_hour) + selected.hour(min_hour); + if (this.timePicker12Hour && min_hour >= 12 && selected.hour() >= 12) + min_hour -= 12; + if (this.timePicker12Hour && min_hour == 12) + min_hour = 1; + } + + if (maxDate && (side == 'right' || this.singleDatePicker) && selected.format('YYYY-MM-DD') == maxDate.format('YYYY-MM-DD')) { + max_hour = maxDate.hour(); + if (selected.hour() > max_hour) + selected.hour(max_hour); + if (this.timePicker12Hour && max_hour >= 12 && selected.hour() >= 12) + max_hour -= 12; + } + var start = 0; var end = 23; var selected_hour = selected.hour(); @@ -822,13 +1133,16 @@ end = 12; if (selected_hour >= 12) selected_hour -= 12; - if (selected_hour == 0) + if (selected_hour === 0) selected_hour = 12; } - for (var i = start; i <= end; i++) { + for (i = start; i <= end; i++) { + if (i == selected_hour) { html += ''; + } else if (i < min_hour || i > max_hour) { + html += ''; } else { html += ''; } @@ -838,12 +1152,30 @@ html += ' '; + if (this.timePickerSeconds) { + html += ': '; + } + if (this.timePicker12Hour) { html += ''; } @@ -867,6 +1229,14 @@ return html; + }, + + remove: function() { + + this.container.remove(); + this.element.off('.daterangepicker'); + this.element.removeData('daterangepicker'); + } }; @@ -874,10 +1244,11 @@ $.fn.daterangepicker = function (options, cb) { this.each(function () { var el = $(this); - if (!el.data('daterangepicker')) - el.data('daterangepicker', new DateRangePicker(el, options, cb)); + if (el.data('daterangepicker')) + el.data('daterangepicker').remove(); + el.data('daterangepicker', new DateRangePicker(el, options, cb)); }); return this; }; -}(window.jQuery); +})); From 0be37b9e8578115728b86644de21b4465504bfd0 Mon Sep 17 00:00:00 2001 From: Adirelle Date: Thu, 8 Jan 2015 17:30:15 +0100 Subject: [PATCH 068/329] Franch translation updates. Closes #733 --- PHPCI/Languages/lang.fr.php | 56 ++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/PHPCI/Languages/lang.fr.php b/PHPCI/Languages/lang.fr.php index bd85bccd..9e7cd339 100644 --- a/PHPCI/Languages/lang.fr.php +++ b/PHPCI/Languages/lang.fr.php @@ -14,21 +14,21 @@ $strings = array( // Log in: 'log_in_to_phpci' => 'Connectez-vous à PHPCI', 'login_error' => 'Adresse email ou mot de passe invalide', - 'forgotten_password_link' => 'Mot de passe oublié ?', + 'forgotten_password_link' => 'Mot de passe oublié ?', 'reset_emailed' => 'Nous vous avons envoyé un email avec un lien pour réinitialiser votre mot de passe.', 'reset_header' => 'Pas d\'inquiétude
    Entrez simplement votre adresse email ci-dessous et nous vous enverrons un message avec un lien pour réinitialiser votre mot de passe.', 'reset_email_address' => 'Entrez votre adresse email:', 'reset_send_email' => 'Envoyer le mail', 'reset_enter_password' => 'Veuillez entrer un nouveau mot de passe', - 'reset_new_password' => 'Nouveau mot de passe :', + 'reset_new_password' => 'Nouveau mot de passe :', 'reset_change_password' => 'Modifier le mot de passe', 'reset_no_user_exists' => 'Il n\'existe aucun utilisateur avec cette adresse email, merci de réessayer.', 'reset_email_body' => 'Bonjour %s, Vous avez reçu cet email parce qu\'une demande de réinitialisation de mot de passe a été faite pour votre compte PHPCI. -Si c\'est bien vous, merci de cliquer sur le lien suivant pour réinitialiser votre mot de passe : %ssession/reset-password/%d/%s +Si c\'est bien vous, merci de cliquer sur le lien suivant pour réinitialiser votre mot de passe : %ssession/reset-password/%d/%s Sinon, merci d\'ignorer ce message. @@ -49,9 +49,9 @@ PHPCI', 'n_builds_running' => '%d builds en cours d\'exécution', 'edit_profile' => 'Éditer le profil', 'sign_out' => 'Déconnexion', - 'branch_x' => 'Branche : %s', - 'created_x' => 'Créé à : %s', - 'started_x' => 'Démarré à : %s', + 'branch_x' => 'Branche : %s', + 'created_x' => 'Créé à : %s', + 'started_x' => 'Démarré à : %s', // Sidebar 'hello_name' => 'Salut %s', @@ -67,19 +67,19 @@ PHPCI', 'delete_project' => 'Supprimer le projet', // Project Summary: - 'no_builds_yet' => 'Aucun build pour le moment!', - 'x_of_x_failed' => '%d parmis les derniers %d builds ont échoué.', - 'x_of_x_failed_short' => '%d / %d ont échoué.', - 'last_successful_build' => ' Le dernier build qui a réussi est %s.', - 'never_built_successfully' => ' Aucun build n\'a été exécuté avec succès sur ce projet.', - 'all_builds_passed' => 'Les derniers %d builds ont réussis.', - 'all_builds_passed_short' => '%d / %d ont réussis.', - 'last_failed_build' => ' Le dernier build en échec est %s.', - 'never_failed_build' => ' Ce projet n\'a jamais eu un build en échec.', + 'no_builds_yet' => 'Aucun build pour le moment !', + 'x_of_x_failed' => '%d des %d derniers builds ont échoué.', + 'x_of_x_failed_short' => '%d échecs / %d.', + 'last_successful_build' => ' Le dernier build réussi date du %s.', + 'never_built_successfully' => ' Aucun build de ce projet n\'a réussi.', + 'all_builds_passed' => 'Les %d derniers builds ont réussi.', + 'all_builds_passed_short' => '%d réussites / %d.', + 'last_failed_build' => ' Le dernier build en échec date du %s.', + 'never_failed_build' => ' Aucun build de ce projet n\'a échoué.', 'view_project' => 'Voir le projet', // Timeline: - 'latest_builds' => 'Les derniers Builds', + 'latest_builds' => 'Derniers builds', 'pending' => 'En attente', 'running' => 'En cours', 'success' => 'Terminé', @@ -102,8 +102,8 @@ PHPCI', 'local' => 'Chemin local', 'hg' => 'Mercurial', - 'where_hosted' => 'Où est hébergé votre projet ?', - 'choose_github' => 'Choisissez un dépôt GitHub :', + 'where_hosted' => 'Où est hébergé votre projet ?', + 'choose_github' => 'Choisissez un dépôt GitHub :', 'repo_name' => 'Nom du dépôt / URL (distance) ou chemin (local)', 'project_title' => 'Titre du projet', @@ -112,7 +112,7 @@ PHPCI', 'build_config' => 'Configuration PHPCI spécifique pour ce projet (si vous ne pouvez pas ajouter de fichier phpci.yml à la racine du dépôt)', 'default_branch' => 'Nom de la branche par défaut', - 'allow_public_status' => 'Activer la page de statut publique et l\'image pour ce projet ?', + 'allow_public_status' => 'Activer la page de statut publique et l\'image pour ce projet ?', 'save_project' => 'Enregistrer le projet', 'error_mercurial' => 'Les URLs de dépôt Mercurial doivent commencer par http:// ou https://', @@ -155,7 +155,7 @@ PHPCI', 'committed_by_x' => 'Committé par %s', - 'commit_id_x' => 'Commit: %s', + 'commit_id_x' => 'Commit : %s', 'chart_display' => 'Ce graphique s\'affichera une fois que le build sera terminé.', @@ -207,7 +207,7 @@ PHPCI', 'update_your_details' => 'Mettre à jour vos préférences', 'your_details_updated' => 'Vos préférences ont été bien mises à jour.', 'add_user' => 'Ajouter un utilisateur', - 'is_admin' => 'Est-il administrateur ?', + 'is_admin' => 'Est-il administrateur ?', 'yes' => 'Oui', 'no' => 'Non', 'edit' => 'Éditer', @@ -287,17 +287,17 @@ PHPCI', 'config_path' => 'Chemin vers le fichier de configuration', 'install_phpci' => 'Installer PHPCI', 'welcome_to_phpci' => 'Bienvenue sur PHPCI', - 'please_answer' => 'Merci de répondre aux questions suivantes:', + 'please_answer' => 'Merci de répondre aux questions suivantes :', 'phpci_php_req' => 'PHPCI requiert au moins PHP 5.3.8 pour fonctionner.', - 'extension_required' => 'Extensions requises: %s', + 'extension_required' => 'Extensions requises : %s', 'function_required' => 'PHPCI doit être capable d\'appeler la fonction %s(). Est-ce qu\'elle est désactivée dans votre php.ini?', 'requirements_not_met' => 'PHPCI ne peut pas être installé parce que toutes les conditions requises ne sont pas respectées. Merci de corriger les erreurs ci-dessus avant de continuer.', 'must_be_valid_email' => 'Doit être une adresse email valide.', 'must_be_valid_url' => 'Doit être une URL valide.', - 'enter_name' => 'Nom de l\'admin:', - 'enter_email' => 'Email de l\'admin:', - 'enter_password' => 'Mot de passe de l\'admin:', + 'enter_name' => 'Nom de l\'admin :', + 'enter_email' => 'Email de l\'admin :', + 'enter_password' => 'Mot de passe de l\'admin :', 'enter_phpci_url' => 'Votre URL vers PHPCI (par exemple "http://phpci.local"): ', 'enter_db_host' => 'Merci d\'entrer le nom d\'hôte MySQL [localhost]: ', @@ -306,7 +306,7 @@ PHPCI', 'enter_db_pass' => 'Merci d\'entrer le mot de passe MySQL: ', 'could_not_connect' => 'PHPCI ne peut pas se connecter à MySQL à partir des informations fournies. Veuillez réessayer..', 'setting_up_db' => 'Paramétrage de la base de données... ', - 'user_created' => 'Le compte utilisateur a été créé!', + 'user_created' => 'Le compte utilisateur a été créé !', 'failed_to_create' => 'PHPCI n\'a pas réussi à créer votre compte admin.', 'config_exists' => 'Le fichier de configuration PHPCI existe et n\'est pas vide.', 'update_instead' => 'Si vous essayez de mettre à jour PHPCI, merci d\'utiliser la commande phpci:update.', @@ -365,7 +365,7 @@ PHPCI', 'n_emails_sent' => '%d emails envoyés.', 'n_emails_failed' => '%d emails dont l\'envoi a échoué.', 'unable_to_set_env' => 'Impossible d\'initialiser la variable d\'environnement', - 'tag_created' => 'Tag créé par PHPCI: %s', + 'tag_created' => 'Tag créé par PHPCI : %s', 'x_built_at_x' => '%PROJECT_TITLE% construit à %BUILD_URI%', 'hipchat_settings' => 'Merci de définir une "room" et un "authToken" pour le plugin hipchat_notify', 'irc_settings' => 'Vous devez configurer un serveur, une "room" et un "nick".', From 353c4cafdb3a4f49914821cac2082ebd7f488540 Mon Sep 17 00:00:00 2001 From: Adirelle Date: Thu, 8 Jan 2015 16:48:28 +0100 Subject: [PATCH 069/329] Remove duplicates from the list of recipients in the email plugin. Closes #731 --- PHPCI/Plugin/Email.php | 2 +- Tests/PHPCI/Plugin/EmailTest.php | 57 ++++++++++++++++++++++++++++++-- 2 files changed, 56 insertions(+), 3 deletions(-) diff --git a/PHPCI/Plugin/Email.php b/PHPCI/Plugin/Email.php index 98b226e3..7c5171d6 100644 --- a/PHPCI/Plugin/Email.php +++ b/PHPCI/Plugin/Email.php @@ -182,7 +182,7 @@ class Email implements \PHPCI\Plugin $addresses[] = $this->options['default_mailto_address']; return $addresses; } - return $addresses; + return array_unique($addresses); } /** diff --git a/Tests/PHPCI/Plugin/EmailTest.php b/Tests/PHPCI/Plugin/EmailTest.php index 87225772..0fa2d8f0 100644 --- a/Tests/PHPCI/Plugin/EmailTest.php +++ b/Tests/PHPCI/Plugin/EmailTest.php @@ -57,6 +57,10 @@ class EmailTest extends \PHPUnit_Framework_TestCase ->method('getStatus') ->will($this->returnValue(\PHPCI\Model\Build::STATUS_SUCCESS)); + $this->mockBuild->expects($this->any()) + ->method('getCommitterEmail') + ->will($this->returnValue("committer@test.com")); + $this->mockCiBuilder = $this->getMock( '\PHPCI\Builder', array( @@ -151,8 +155,53 @@ class EmailTest extends \PHPUnit_Framework_TestCase ); $this->assertEquals($expectedReturn, $returnValue); + } + /** + * @covers PHPUnit::execute + */ + public function testExecute_UniqueRecipientsFromWithCommitter() + { + $this->loadEmailPluginWithOptions( + array( + 'addresses' => array('test-receiver@example.com', 'test-receiver2@example.com') + ) + ); + $actualMails = []; + $this->catchMailPassedToSend($actualMails); + + $returnValue = $this->testedEmailPlugin->execute(); + $this->assertTrue($returnValue); + + $this->assertCount(2, $actualMails); + + $actualTos = array(key($actualMails[0]->getTo()), key($actualMails[1]->getTo())); + $this->assertContains('test-receiver@example.com', $actualTos); + $this->assertContains('test-receiver2@example.com', $actualTos); + } + + /** + * @covers PHPUnit::execute + */ + public function testExecute_UniqueRecipientsWithCommiter() + { + $this->loadEmailPluginWithOptions( + array( + 'commiter' => true, + 'addresses' => array('test-receiver@example.com', 'committer@test.com') + ) + ); + + $actualMails = []; + $this->catchMailPassedToSend($actualMails); + + $returnValue = $this->testedEmailPlugin->execute(); + $this->assertTrue($returnValue); + + $actualTos = array(key($actualMails[0]->getTo()), key($actualMails[1]->getTo())); + $this->assertContains('test-receiver@example.com', $actualTos); + $this->assertContains('committer@test.com', $actualTos); } /** @@ -215,12 +264,16 @@ class EmailTest extends \PHPUnit_Framework_TestCase */ protected function catchMailPassedToSend(&$actualMail) { - $this->mockMailer->expects($this->once()) + $this->mockMailer->expects(is_array($actualMail) ? $this->atLeast(1) : $this->once()) ->method('send') ->will( $this->returnCallback( function ($passedMail) use (&$actualMail) { - $actualMail = $passedMail; + if(is_array($actualMail)) { + $actualMail[] = $passedMail; + } else { + $actualMail = $passedMail; + } return array(); } ) From e531c80718e635c1bb0a838bc9e81aac093f686e Mon Sep 17 00:00:00 2001 From: Daniel Seif Date: Mon, 5 Jan 2015 00:53:40 +0100 Subject: [PATCH 070/329] Reset the status of a duplicated build to avoid strict-mode errors. When using SQL strict mode, mysql would complain that no default value of the status column is set. Setting the status to 0 before duplicating fixes this. Closes #725 --- PHPCI/Service/BuildService.php | 1 + 1 file changed, 1 insertion(+) diff --git a/PHPCI/Service/BuildService.php b/PHPCI/Service/BuildService.php index b4721779..ca2336c8 100644 --- a/PHPCI/Service/BuildService.php +++ b/PHPCI/Service/BuildService.php @@ -100,6 +100,7 @@ class BuildService $build = new Build(); $build->setValues($data); $build->setCreated(new \DateTime()); + $build->setStatus(0); return $this->buildStore->save($build); } From 4a1d62b44aff9cb48464828f6fbd53bacd2f5795 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Tue, 3 Feb 2015 11:04:55 +0000 Subject: [PATCH 071/329] Make build log and meta value columns use MEDIUMTEXT data type. Closes #777 --- .../20150203105015_fix_column_types.php | 28 +++++ composer.lock | 107 +++++------------- 2 files changed, 59 insertions(+), 76 deletions(-) create mode 100644 PHPCI/Migrations/20150203105015_fix_column_types.php diff --git a/PHPCI/Migrations/20150203105015_fix_column_types.php b/PHPCI/Migrations/20150203105015_fix_column_types.php new file mode 100644 index 00000000..9a693594 --- /dev/null +++ b/PHPCI/Migrations/20150203105015_fix_column_types.php @@ -0,0 +1,28 @@ +table('build'); + $build->changeColumn('log', 'text', array( + 'null' => true, + 'default' => '', + 'limit' => MysqlAdapter::TEXT_MEDIUM, + )); + + // Update the build meta value column to MEDIUMTEXT: + $buildMeta = $this->table('build_meta'); + $buildMeta->changeColumn('meta_value', 'text', array( + 'null' => false, + 'limit' => MysqlAdapter::TEXT_MEDIUM, + )); + } +} \ No newline at end of file diff --git a/composer.lock b/composer.lock index a65ea8fd..4ec183ff 100644 --- a/composer.lock +++ b/composer.lock @@ -255,21 +255,20 @@ }, { "name": "robmorgan/phinx", - "version": "v0.4.1", + "version": "v0.4.2.1", "source": { "type": "git", "url": "https://github.com/robmorgan/phinx.git", - "reference": "357210707c000f50edea802d84b74724ad122478" + "reference": "1bc1396392d4073b8b29ee5289e445889cbc12b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/robmorgan/phinx/zipball/357210707c000f50edea802d84b74724ad122478", - "reference": "357210707c000f50edea802d84b74724ad122478", + "url": "https://api.github.com/repos/robmorgan/phinx/zipball/1bc1396392d4073b8b29ee5289e445889cbc12b5", + "reference": "1bc1396392d4073b8b29ee5289e445889cbc12b5", "shasum": "" }, "require": { "php": ">=5.3.2", - "symfony/class-loader": "~2.6.0", "symfony/config": "~2.6.0", "symfony/console": "~2.6.0", "symfony/yaml": "~2.6.0" @@ -283,8 +282,8 @@ ], "type": "library", "autoload": { - "psr-0": { - "Phinx": "src/" + "psr-4": { + "Phinx\\": "src/Phinx" } }, "notification-url": "https://packagist.org/downloads/", @@ -297,6 +296,12 @@ "email": "robbym@gmail.com", "homepage": "http://robmorgan.id.au", "role": "Lead Developer" + }, + { + "name": "Woody Gilk", + "email": "woody.gilk@gmail.com", + "homepage": "http://shadowhand.me", + "role": "Developer" } ], "description": "Phinx makes it ridiculously easy to manage the database migrations for your PHP app.", @@ -308,7 +313,7 @@ "migrations", "phinx" ], - "time": "2014-12-23 06:06:14" + "time": "2015-02-08 03:41:44" }, { "name": "swiftmailer/swiftmailer", @@ -362,56 +367,6 @@ ], "time": "2014-12-05 14:17:14" }, - { - "name": "symfony/class-loader", - "version": "v2.6.4", - "target-dir": "Symfony/Component/ClassLoader", - "source": { - "type": "git", - "url": "https://github.com/symfony/ClassLoader.git", - "reference": "deac802f76910708ab50d039806cfd1866895b52" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/deac802f76910708ab50d039806cfd1866895b52", - "reference": "deac802f76910708ab50d039806cfd1866895b52", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "symfony/finder": "~2.0,>=2.0.5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev" - } - }, - "autoload": { - "psr-0": { - "Symfony\\Component\\ClassLoader\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "Symfony ClassLoader Component", - "homepage": "http://symfony.com", - "time": "2015-01-05 14:28:40" - }, { "name": "symfony/config", "version": "v2.6.4", @@ -761,27 +716,27 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "38743b677965c48a637097b2746a281264ae2347" + "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/38743b677965c48a637097b2746a281264ae2347", - "reference": "38743b677965c48a637097b2746a281264ae2347", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8", + "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "3.7.*@stable" + "phpunit/phpunit": "~4.0" }, "suggest": { - "dflydev/markdown": "1.0.*", - "erusev/parsedown": "~0.7" + "dflydev/markdown": "~1.0", + "erusev/parsedown": "~1.0" }, "type": "library", "extra": { @@ -806,7 +761,7 @@ "email": "mike.vanriel@naenius.com" } ], - "time": "2014-08-09 10:27:07" + "time": "2015-02-03 12:10:50" }, { "name": "phploc/phploc", @@ -1274,16 +1229,16 @@ }, { "name": "phpunit/phpunit", - "version": "4.4.5", + "version": "4.5.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "2e8580deebb7d1ac92ac878595e6bffe01069c2a" + "reference": "5b578d3865a9128b9c209b011fda6539ec06e7a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2e8580deebb7d1ac92ac878595e6bffe01069c2a", - "reference": "2e8580deebb7d1ac92ac878595e6bffe01069c2a", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/5b578d3865a9128b9c209b011fda6539ec06e7a5", + "reference": "5b578d3865a9128b9c209b011fda6539ec06e7a5", "shasum": "" }, "require": { @@ -1293,17 +1248,17 @@ "ext-reflection": "*", "ext-spl": "*", "php": ">=5.3.3", + "phpspec/prophecy": "~1.3.1", "phpunit/php-code-coverage": "~2.0", "phpunit/php-file-iterator": "~1.3.2", "phpunit/php-text-template": "~1.2", "phpunit/php-timer": "~1.0.2", "phpunit/phpunit-mock-objects": "~2.3", - "sebastian/comparator": "~1.0", + "sebastian/comparator": "~1.1", "sebastian/diff": "~1.1", - "sebastian/environment": "~1.1", - "sebastian/exporter": "~1.1", + "sebastian/environment": "~1.2", + "sebastian/exporter": "~1.2", "sebastian/global-state": "~1.0", - "sebastian/recursion-context": "~1.0", "sebastian/version": "~1.0", "symfony/yaml": "~2.0" }, @@ -1316,7 +1271,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.4.x-dev" + "dev-master": "4.5.x-dev" } }, "autoload": { @@ -1342,7 +1297,7 @@ "testing", "xunit" ], - "time": "2015-01-27 16:06:15" + "time": "2015-02-05 15:51:19" }, { "name": "phpunit/phpunit-mock-objects", From f0d53638dcfd60ad23c09f0fbd10943e50e2e645 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?A=CC=80lex=20Corretge=CC=81?= Date: Mon, 9 Feb 2015 10:00:42 +0100 Subject: [PATCH 072/329] Allow modification of PHPCI variables without modifying versioned code. Closes #786 Closes #781 --- .gitignore | 1 + bootstrap.php | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/.gitignore b/.gitignore index fbfc1a28..79784a60 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ PHPCI/Model/Migration.php PHPCI/Model/Base/MigrationBase.php PHPCI/Store/MigrationStore.php PHPCI/Store/Base/MigrationStoreBase.php +local_vars.php diff --git a/bootstrap.php b/bootstrap.php index 89d7c95b..b15a7e59 100755 --- a/bootstrap.php +++ b/bootstrap.php @@ -62,6 +62,17 @@ if (file_exists($configFile)) { $config->loadYaml($configFile); } +/** + * Allow to modify PHPCI configuration without modify versioned code. + * Dameons should be killed to apply changes in the file. + * + * @ticket 781 + */ +$localVarsFile = dirname(__FILE__) . '/local_vars.php'; +if (is_readable($localVarsFile)) { + require_once $localVarsFile; +} + require_once(dirname(__FILE__) . '/vars.php'); \PHPCI\Helper\Lang::init($config); From 935ffe447377e4fb0f6c5708e44766e10b5f767a Mon Sep 17 00:00:00 2001 From: Luca Date: Sun, 8 Feb 2015 16:36:14 +0100 Subject: [PATCH 073/329] Some Italian language translation improvements. Closes #784 --- PHPCI/Languages/lang.it.php | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/PHPCI/Languages/lang.it.php b/PHPCI/Languages/lang.it.php index 7134c488..e4b531e0 100644 --- a/PHPCI/Languages/lang.it.php +++ b/PHPCI/Languages/lang.it.php @@ -16,20 +16,19 @@ $strings = array( 'log_in_to_phpci' => 'Accedi a PHPCI', 'login_error' => 'Indirizzo email o password errati', 'forgotten_password_link' => 'Hai dimenticato la tua password?', - 'reset_emailed' => 'Ti abbiamo inviato un link per ripristinare la tua password via email.', + 'reset_emailed' => 'Ti abbiamo inviato un link via email per ripristinare la tua password.', 'reset_header' => 'Non preoccuparti!
    E\' sufficiente inserire il tuo indirizzo email di seguito e ti invieremo una email con il link per il ripristino della tua password.', 'reset_email_address' => 'Inserisci il tuo indirizzo email:', 'reset_send_email' => 'Invia il link di reset della password', 'reset_enter_password' => 'Per favore inserisci la nuova password', 'reset_new_password' => 'Nuova password:', 'reset_change_password' => 'Cambia password', - 'reset_no_user_exists' => 'No user exists with that email address, please try again.', 'reset_no_user_exists' => 'Non esiste nessun utente con questo indirizzo email, per favore prova ancora.', 'reset_email_body' => 'Ciao %s, hai ricevuto questa email perché tu, o qualcun\'altro, ha richiesto un reset della password per PHPCI. -Se questa mail è tua, per favore apri il seguente link per resettare la tua password: %ssession/reset-password/%d/%s +Se questa mail è tua, per favore apri il seguente link per ripristinare la tua password: %ssession/reset-password/%d/%s altrimenti, per favore, ignora questa email e nessuna azione verrà intrapresa. @@ -113,7 +112,7 @@ PHPCI', (se non puoi aggiungere il file phpci.yml nel repository di questo progetto)', 'default_branch' => 'Nome del branch di default', 'allow_public_status' => 'Vuoi rendere pubblica la pagina dello stato e l\'immagine per questo progetto?', - 'save_project' => 'Salca il Progetto', + 'save_project' => 'Salva il Progetto', 'error_mercurial' => 'L\'URL del repository Mercurial URL deve iniziare con http:// o https://', 'error_remote' => 'L\'URL del repository deve iniziare con git://, http:// o https://', @@ -137,16 +136,16 @@ PHPCI', 'delete_build' => 'Rimuovi build', 'webhooks' => 'Webhooks', - 'webhooks_help_github' => 'Per efettuare la build automatica di questo progetto quando vengono pushati nuovi commit, + 'webhooks_help_github' => 'Per effettuare la build automatica di questo progetto quando vengono inseriti nuovi commit, aggiungi l\'URL seguente come "Webhook" nella sezione     Webhooks and Services del tuo repository su GitHub.', - 'webhooks_help_gitlab' => 'Per efettuare la build automatica di questo progetto quando vengono pushati nuovi commit, + 'webhooks_help_gitlab' => 'Per effettuare la build automatica di questo progetto quando vengono inseriti nuovi commit, aggiungi l\'URL seguente come "Webhook URL" nella sezione "WebHook URL" del tuo repository GitLab.', - 'webhooks_help_bitbucket' => 'Per efettuare la build automatica di questo progetto quando vengono pushati nuovi + 'webhooks_help_bitbucket' => 'Per effettuare la build automatica di questo progetto quando vengono inseriti nuovi commit, aggiungi l\'URL seguente come serizio "POST" nella sezione Services del tuo repository su BITBUCKET.', @@ -157,7 +156,7 @@ PHPCI', 'rebuild_now' => 'Esegui nuovamente la build ora', - 'committed_by_x' => 'Committato da %s', + 'committed_by_x' => 'Inviato da %s', 'commit_id_x' => 'Commit: %s', 'chart_display' => 'Questo grafico verrà mostrato una volta terminata la build.', @@ -169,9 +168,9 @@ PHPCI', 'logical_lines' => 'Linee di logica', 'lines_of_code' => 'Linee di codice', 'build_log' => 'Log della build', - 'quality_trend' => 'Trand della qualità', - 'phpmd_warnings' => 'Warning di PHPMD', - 'phpcs_warnings' => 'Warning di PHPCS', + 'quality_trend' => 'Trend della qualità', + 'phpmd_warnings' => 'Avvisi di PHPMD', + 'phpcs_warnings' => 'Avvisi di PHPCS', 'phpcs_errors' => 'Errori di PHPCS', 'phplint_errors' => 'Errori di Lint', 'phpunit_errors' => 'Errori di PHPUnit', @@ -228,16 +227,16 @@ PHPCI', 'settings_github_linked' => 'Il tuo account GitHub è stato collegato.', 'settings_github_not_linked' => 'Il tuo account GitHub non può essere collegato.', 'build_settings' => 'Configurazioni della build', - 'github_application' => 'Applicatzione GitHub', + 'github_application' => 'Applicazione GitHub', 'github_sign_in' => 'Prima di poter iniziare ad usare GitHub, è necessario collegarsi e garantire a PHPCI l\'accesso al tuo account.', 'github_phpci_linked' => 'PHPCI è stato collegato correttamente al tuo account GitHub.', 'github_where_to_find' => 'Dove trovare queste...', - 'github_where_help' => 'Se sei il proprietario dell\'applicazione, puoi trovare queste informazioni nell\'are delle + 'github_where_help' => 'Se sei il proprietario dell\'applicazione, puoi trovare queste informazioni nell\'area delle configurazioni dell\'applicazione.', 'email_settings' => 'Impostazioni Email', - 'email_settings_help' => 'Prima che possa inviare le email con lo status PHPCI, devi configurare l\'SMTP qio sotto.', + 'email_settings_help' => 'Prima che possa inviare le email con lo status PHPCI, devi configurare l\'SMTP qui sotto.', 'application_id' => 'ID dell\'Applicazione', 'application_secret' => 'Secret dell\'Applicazione', @@ -263,7 +262,7 @@ PHPCI', // Plugins 'cannot_update_composer' => 'PHPCI non può aggiornare composer.json per te non essendo scrivibile.', 'x_has_been_removed' => '%s è stato rimosso.', - 'x_has_been_added' => '%s è stato aggiunto al composer.json per te verrà installato la prossima volta che eseguirai + 'x_has_been_added' => '%s è stato aggiunto al file composer.json per te, verrà installato la prossima volta che eseguirai composer update.', 'enabled_plugins' => 'Plugins attivati', 'provided_by_package' => 'Fornito dal pacchetto', @@ -338,7 +337,7 @@ PHPCI', 'finding_builds' => 'Ricerca delel build da processare', 'found_n_builds' => 'Trovate %d build', 'skipping_build' => 'Saltata la build %d - La build del progetto è già in corso.', - 'marked_as_failed' => 'Build %d è satata contrassegnata come come fallita per un timeout.', + 'marked_as_failed' => 'Build %d è stata contrassegnata come fallita per un timeout.', // Builder 'missing_phpci_yml' => 'Questo progetto non contiene il file phpci.yml, o il file è vuoto.', From 4f73063fb7d9f25b190526fdc1093aeaee668abc Mon Sep 17 00:00:00 2001 From: Lee Willis Date: Sun, 8 Feb 2015 10:24:27 +0000 Subject: [PATCH 074/329] Redesigned build summary for the dashboard to include recent builds. Closes #783 Closes #708 --- PHPCI/View/SummaryTable.phtml | 96 +++++++++++++++++++-------- public/assets/css/AdminLTE-custom.css | 24 +++++++ 2 files changed, 93 insertions(+), 27 deletions(-) diff --git a/PHPCI/View/SummaryTable.phtml b/PHPCI/View/SummaryTable.phtml index 10782a5b..56df6e38 100644 --- a/PHPCI/View/SummaryTable.phtml +++ b/PHPCI/View/SummaryTable.phtml @@ -3,17 +3,32 @@ use PHPCI\Helper\Lang; foreach($projects as $project): $statuses = array(); - $successes = 0; $failures = 0; - $subcls = ''; + $subcls = 'yellow'; $cls = ''; $success = null; $failure = null; if (count($builds[$project->getId()])) { + // Get the most recent build status to determine the main block colour. + $last_build = $builds[$project->getId()][0]; + $status = $last_build->getStatus(); + switch($status) { + case 0: + $subcls = 'blue'; + break; + case 1: + $subcls = 'yellow'; + break; + case 2: + $subcls = 'green'; + break; + case 3: + $subcls = 'red'; + break; + } // Use the last 5 builds to determine project health: - $successes = 0; $failures = 0; foreach ($builds[$project->getId()] as $build) { @@ -25,7 +40,6 @@ foreach($projects as $project): $statuses[] = 'running'; break; case 2: - $successes++; $statuses[] = 'ok'; $success = is_null($success) && !is_null($build->getFinished()) ? Lang::formatDateTime($build->getFinished()) : $success; break; @@ -38,15 +52,6 @@ foreach($projects as $project): } } - if ($failures == 0) { - $subcls = 'green'; - } elseif ($successes == 0) { - $subcls = 'red'; - } else { - $subcls = 'yellow'; - } - - $buildCount = count($builds[$project->getId()]); $lastSuccess = $successful[$project->getId()]; $lastFailure = $failed[$project->getId()]; @@ -77,24 +82,31 @@ foreach($projects as $project): ?> + 10) { + $containerClass = 'small-box-minimal'; + } else { + $containerClass = 'small-box-full'; + } +?> + +
    + 10): ?> -
    -
    -

    - - - getTitle(); ?> - - - - -

    -
    +
    +

    + + + getTitle(); ?> + + - + +

    -

    @@ -110,10 +122,40 @@ foreach($projects as $project):
    -     + -

    + + getId()][$idx])) { + echo ''; + } else { + $build = $builds[$project->getId()][$idx]; + $link = PHPCI_URL . 'build/view/' . $build->id; + switch ($build->getStatus()) { + case 0: + $class = 'bg-blue'; + $icon = 'fa-minus'; + break; + case 1: + $class = 'bg-yellow'; + $icon = 'fa-clock-o'; + break; + case 2: + $class = 'bg-green'; + $icon = 'fa-check'; + break; + case 3: + $class = 'bg-red'; + $icon = 'fa-times'; + break; + } + echo ''; + } + } ?> +
    +
    + diff --git a/public/assets/css/AdminLTE-custom.css b/public/assets/css/AdminLTE-custom.css index 009a360b..a0fb3dd7 100644 --- a/public/assets/css/AdminLTE-custom.css +++ b/public/assets/css/AdminLTE-custom.css @@ -51,3 +51,27 @@ overflow: hidden; text-overflow: ellipsis; } + +.small-box > .inner { + border-bottom: 1px solid rgba(0, 0, 0, 0.15); +} + +.small-box > .small-box-footer-project { + width: 60%; + float: left; +} +.small-box > .small-box-footer-build { + width: 8%; + float: left; +} +.small-box-minimal > .inner { + width: 71%; + float: left; +} +.small-box-minimal > .small-box-footer-build { + width: 5%; + border: 1px solid rgba(0, 0, 0, 0.15); + margin-left: 1px; + margin-top: 19px; + font-size: 11px; +} \ No newline at end of file From 4d91bd15e73329a0db3c0cc759061383854f2268 Mon Sep 17 00:00:00 2001 From: vigo5190 Date: Wed, 14 Jan 2015 14:06:32 +0300 Subject: [PATCH 075/329] Update Slack plugin to support the latest version of the library it relies on. Closes #742 Closes #747 --- PHPCI/Plugin/SlackNotify.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/PHPCI/Plugin/SlackNotify.php b/PHPCI/Plugin/SlackNotify.php index 229715ea..1e1e3961 100644 --- a/PHPCI/Plugin/SlackNotify.php +++ b/PHPCI/Plugin/SlackNotify.php @@ -1,7 +1,6 @@ icon = $options['icon']; } - } else { throw new \Exception('Please define the webhook_url for slack_notify plugin!'); } @@ -91,9 +89,9 @@ class SlackNotify implements \PHPCI\Plugin // Build up the attachment data $attachment = new \Maknz\Slack\Attachment(array( 'fallback' => $message, - 'pretext' => $message, - 'color' => $color, - 'fields' => array( + 'pretext' => $message, + 'color' => $color, + 'fields' => array( new \Maknz\Slack\AttachmentField(array( 'title' => 'Status', 'value' => $status, @@ -104,23 +102,25 @@ class SlackNotify implements \PHPCI\Plugin $client = new \Maknz\Slack\Client($this->webHook); + $message = $client->createMessage(); + if (!empty($this->room)) { - $client->setChannel($this->room); + $message->setChannel($this->room); } if (!empty($this->username)) { - $client->setUsername($this->username); + $message->setUsername($this->username); } if (!empty($this->icon)) { - $client->setIcon($this->icon); + $message->setIcon($this->icon); } - $client->attach($attachment); + $message->attach($attachment); $success = true; - $client->send(''); // FIXME: Handle errors + $message->send(''); // FIXME: Handle errors return $success; } From 9379da13939b60cecd525977e7e4fc0439c11d69 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 12 Feb 2015 10:39:41 +0000 Subject: [PATCH 076/329] Fixing SensioLabs Insight 'Critical' violations. --- PHPCI/Command/DaemoniseCommand.php | 3 ++- PHPCI/Helper/WindowsCommandExecutor.php | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/PHPCI/Command/DaemoniseCommand.php b/PHPCI/Command/DaemoniseCommand.php index 915890bd..0bcd42f6 100644 --- a/PHPCI/Command/DaemoniseCommand.php +++ b/PHPCI/Command/DaemoniseCommand.php @@ -87,7 +87,8 @@ class DaemoniseCommand extends Command try { $buildCount = $runner->run($emptyInput, $output); } catch (\Exception $e) { - var_dump($e); + $output->writeln('Exception: ' . $e->getMessage() . ''); + $output->writeln('Line: ' . $e->getLine() . ' - File: ' . $e->getFile() . ''); } if (0 == $buildCount && $this->sleep < 15) { diff --git a/PHPCI/Helper/WindowsCommandExecutor.php b/PHPCI/Helper/WindowsCommandExecutor.php index aa01fea4..a1d0889f 100644 --- a/PHPCI/Helper/WindowsCommandExecutor.php +++ b/PHPCI/Helper/WindowsCommandExecutor.php @@ -22,6 +22,9 @@ class WindowsCommandExecutor extends BaseCommandExecutor */ protected function findGlobalBinary($binary) { - return trim(shell_exec('where ' . $binary)); + $command = sprintf('where %s', $binary); + $result = shell_exec($command); + + return trim($result); } } From d481140ea2a4ffc4a07449b78a972d8352e7466c Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 12 Feb 2015 11:08:45 +0000 Subject: [PATCH 077/329] Fixing issues related to LIMIT in Base Store files. --- PHPCI/Model/Base/ProjectBase.php | 76 ++++++++++++------------- PHPCI/Store/Base/BuildMetaStoreBase.php | 57 ++++--------------- PHPCI/Store/Base/BuildStoreBase.php | 57 ++++--------------- PHPCI/Store/Base/ProjectStoreBase.php | 35 ++---------- PHPCI/Store/Base/UserStoreBase.php | 20 ------- 5 files changed, 63 insertions(+), 182 deletions(-) diff --git a/PHPCI/Model/Base/ProjectBase.php b/PHPCI/Model/Base/ProjectBase.php index bcf793ab..305cafbf 100644 --- a/PHPCI/Model/Base/ProjectBase.php +++ b/PHPCI/Model/Base/ProjectBase.php @@ -38,11 +38,11 @@ class ProjectBase extends Model 'reference' => null, 'branch' => null, 'ssh_private_key' => null, - 'ssh_public_key' => null, 'type' => null, 'access_information' => null, 'last_commit' => null, 'build_config' => null, + 'ssh_public_key' => null, 'allow_public_status' => null, ); @@ -56,11 +56,11 @@ class ProjectBase extends Model 'reference' => 'getReference', 'branch' => 'getBranch', 'ssh_private_key' => 'getSshPrivateKey', - 'ssh_public_key' => 'getSshPublicKey', 'type' => 'getType', 'access_information' => 'getAccessInformation', 'last_commit' => 'getLastCommit', 'build_config' => 'getBuildConfig', + 'ssh_public_key' => 'getSshPublicKey', 'allow_public_status' => 'getAllowPublicStatus', // Foreign key getters: @@ -76,11 +76,11 @@ class ProjectBase extends Model 'reference' => 'setReference', 'branch' => 'setBranch', 'ssh_private_key' => 'setSshPrivateKey', - 'ssh_public_key' => 'setSshPublicKey', 'type' => 'setType', 'access_information' => 'setAccessInformation', 'last_commit' => 'setLastCommit', 'build_config' => 'setBuildConfig', + 'ssh_public_key' => 'setSshPublicKey', 'allow_public_status' => 'setAllowPublicStatus', // Foreign key setters: @@ -117,11 +117,6 @@ class ProjectBase extends Model 'nullable' => true, 'default' => null, ), - 'ssh_public_key' => array( - 'type' => 'text', - 'nullable' => true, - 'default' => null, - ), 'type' => array( 'type' => 'varchar', 'length' => 50, @@ -144,6 +139,11 @@ class ProjectBase extends Model 'nullable' => true, 'default' => null, ), + 'ssh_public_key' => array( + 'type' => 'text', + 'nullable' => true, + 'default' => null, + ), 'allow_public_status' => array( 'type' => 'int', 'length' => 11, @@ -224,18 +224,6 @@ class ProjectBase extends Model return $rtn; } - /** - * Get the value of SshPublicKey / ssh_public_key. - * - * @return string - */ - public function getSshPublicKey() - { - $rtn = $this->data['ssh_public_key']; - - return $rtn; - } - /** * Get the value of Type / type. * @@ -284,6 +272,18 @@ class ProjectBase extends Model return $rtn; } + /** + * Get the value of SshPublicKey / ssh_public_key. + * + * @return string + */ + public function getSshPublicKey() + { + $rtn = $this->data['ssh_public_key']; + + return $rtn; + } + /** * Get the value of AllowPublicStatus / allow_public_status. * @@ -394,24 +394,6 @@ class ProjectBase extends Model $this->_setModified('ssh_private_key'); } - /** - * Set the value of SshPublicKey / ssh_public_key. - * - * @param $value string - */ - public function setSshPublicKey($value) - { - $this->_validateString('SshPublicKey', $value); - - if ($this->data['ssh_public_key'] === $value) { - return; - } - - $this->data['ssh_public_key'] = $value; - - $this->_setModified('ssh_public_key'); - } - /** * Set the value of Type / type. * @@ -486,6 +468,24 @@ class ProjectBase extends Model $this->_setModified('build_config'); } + /** + * Set the value of SshPublicKey / ssh_public_key. + * + * @param $value string + */ + public function setSshPublicKey($value) + { + $this->_validateString('SshPublicKey', $value); + + if ($this->data['ssh_public_key'] === $value) { + return; + } + + $this->data['ssh_public_key'] = $value; + + $this->_setModified('ssh_public_key'); + } + /** * Set the value of AllowPublicStatus / allow_public_status. * diff --git a/PHPCI/Store/Base/BuildMetaStoreBase.php b/PHPCI/Store/Base/BuildMetaStoreBase.php index 36a94f9d..6c4cfc15 100644 --- a/PHPCI/Store/Base/BuildMetaStoreBase.php +++ b/PHPCI/Store/Base/BuildMetaStoreBase.php @@ -20,24 +20,11 @@ class BuildMetaStoreBase extends Store protected $modelName = '\PHPCI\Model\BuildMeta'; protected $primaryKey = 'id'; - /** - * Get a BuildMeta by primary key. - * @param mixed $value Primary key. - * @param string $useConnection Connection to use (read / write) - * @return \PHPCI\Model\BuildMeta|null - */ public function getByPrimaryKey($value, $useConnection = 'read') { return $this->getById($value, $useConnection); } - /** - * Get a BuildMeta by Id. - * @param mixed $value. - * @param string $useConnection Connection to use (read / write) - * @throws \b8\Exception\HttpException - * @return \PHPCI\Model\BuildMeta|null; - */ public function getById($value, $useConnection = 'read') { if (is_null($value)) { @@ -57,31 +44,17 @@ class BuildMetaStoreBase extends Store return null; } - /** - * Get an array of BuildMeta by ProjectId. - * @param mixed $value. - * @param int $limit - * @param string $useConnection Connection to use (read / write) - * @throws \b8\Exception\HttpException - * @return \PHPCI\Model\BuildMeta[] - */ - public function getByProjectId($value, $limit = null, $useConnection = 'read') + public function getByProjectId($value, $limit = 1000, $useConnection = 'read') { if (is_null($value)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); } - $add = ''; - if ($limit) { - $add .= ' LIMIT ' . $limit; - } - - $count = null; - - $query = 'SELECT * FROM `build_meta` WHERE `project_id` = :project_id' . $add; + $query = 'SELECT * FROM `build_meta` WHERE `project_id` = :project_id LIMIT :limit'; $stmt = Database::getConnection($useConnection)->prepare($query); $stmt->bindValue(':project_id', $value); + $stmt->bindValue(':limit', (int)$limit, \PDO::PARAM_INT); if ($stmt->execute()) { $res = $stmt->fetchAll(\PDO::FETCH_ASSOC); @@ -91,37 +64,25 @@ class BuildMetaStoreBase extends Store }; $rtn = array_map($map, $res); + $count = count($rtn); + return array('items' => $rtn, 'count' => $count); } else { return array('items' => array(), 'count' => 0); } } - /** - * Get an array of BuildMeta by BuildId. - * @param mixed $value. - * @param int $limit - * @param string $useConnection Connection to use (read / write) - * @throws \b8\Exception\HttpException - * @return \PHPCI\Model\BuildMeta[] - */ - public function getByBuildId($value, $limit = null, $useConnection = 'read') + public function getByBuildId($value, $limit = 1000, $useConnection = 'read') { if (is_null($value)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); } - $add = ''; - if ($limit) { - $add .= ' LIMIT ' . $limit; - } - - $count = null; - - $query = 'SELECT * FROM `build_meta` WHERE `build_id` = :build_id' . $add; + $query = 'SELECT * FROM `build_meta` WHERE `build_id` = :build_id LIMIT :limit'; $stmt = Database::getConnection($useConnection)->prepare($query); $stmt->bindValue(':build_id', $value); + $stmt->bindValue(':limit', (int)$limit, \PDO::PARAM_INT); if ($stmt->execute()) { $res = $stmt->fetchAll(\PDO::FETCH_ASSOC); @@ -131,6 +92,8 @@ class BuildMetaStoreBase extends Store }; $rtn = array_map($map, $res); + $count = count($rtn); + return array('items' => $rtn, 'count' => $count); } else { return array('items' => array(), 'count' => 0); diff --git a/PHPCI/Store/Base/BuildStoreBase.php b/PHPCI/Store/Base/BuildStoreBase.php index cb1b2824..89d3a82f 100644 --- a/PHPCI/Store/Base/BuildStoreBase.php +++ b/PHPCI/Store/Base/BuildStoreBase.php @@ -20,24 +20,11 @@ class BuildStoreBase extends Store protected $modelName = '\PHPCI\Model\Build'; protected $primaryKey = 'id'; - /** - * Get a Build by primary key. - * @param mixed $value Primary key. - * @param string $useConnection Connection to use (read / write) - * @return \PHPCI\Model\Build|null - */ public function getByPrimaryKey($value, $useConnection = 'read') { return $this->getById($value, $useConnection); } - /** - * Get a Build by Id. - * @param mixed $value. - * @param string $useConnection Connection to use (read / write) - * @throws \b8\Exception\HttpException - * @return \PHPCI\Model\Build|null; - */ public function getById($value, $useConnection = 'read') { if (is_null($value)) { @@ -57,31 +44,17 @@ class BuildStoreBase extends Store return null; } - /** - * Get an array of Build by ProjectId. - * @param mixed $value. - * @param int $limit - * @param string $useConnection Connection to use (read / write) - * @throws \b8\Exception\HttpException - * @return \PHPCI\Model\Build[] - */ - public function getByProjectId($value, $limit = null, $useConnection = 'read') + public function getByProjectId($value, $limit = 1000, $useConnection = 'read') { if (is_null($value)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); } - $add = ''; - if ($limit) { - $add .= ' LIMIT ' . $limit; - } - - $count = null; - - $query = 'SELECT * FROM `build` WHERE `project_id` = :project_id' . $add; + $query = 'SELECT * FROM `build` WHERE `project_id` = :project_id LIMIT :limit'; $stmt = Database::getConnection($useConnection)->prepare($query); $stmt->bindValue(':project_id', $value); + $stmt->bindValue(':limit', (int)$limit, \PDO::PARAM_INT); if ($stmt->execute()) { $res = $stmt->fetchAll(\PDO::FETCH_ASSOC); @@ -91,37 +64,25 @@ class BuildStoreBase extends Store }; $rtn = array_map($map, $res); + $count = count($rtn); + return array('items' => $rtn, 'count' => $count); } else { return array('items' => array(), 'count' => 0); } } - /** - * Get an array of Build by Status. - * @param mixed $value. - * @param int $limit - * @param string $useConnection Connection to use (read / write) - * @throws \b8\Exception\HttpException - * @return \PHPCI\Model\Build[] - */ - public function getByStatus($value, $limit = null, $useConnection = 'read') + public function getByStatus($value, $limit = 1000, $useConnection = 'read') { if (is_null($value)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); } - $add = ''; - if ($limit) { - $add .= ' LIMIT ' . $limit; - } - - $count = null; - - $query = 'SELECT * FROM `build` WHERE `status` = :status' . $add; + $query = 'SELECT * FROM `build` WHERE `status` = :status LIMIT :limit'; $stmt = Database::getConnection($useConnection)->prepare($query); $stmt->bindValue(':status', $value); + $stmt->bindValue(':limit', (int)$limit, \PDO::PARAM_INT); if ($stmt->execute()) { $res = $stmt->fetchAll(\PDO::FETCH_ASSOC); @@ -131,6 +92,8 @@ class BuildStoreBase extends Store }; $rtn = array_map($map, $res); + $count = count($rtn); + return array('items' => $rtn, 'count' => $count); } else { return array('items' => array(), 'count' => 0); diff --git a/PHPCI/Store/Base/ProjectStoreBase.php b/PHPCI/Store/Base/ProjectStoreBase.php index 02692f62..e5a01cdd 100644 --- a/PHPCI/Store/Base/ProjectStoreBase.php +++ b/PHPCI/Store/Base/ProjectStoreBase.php @@ -20,24 +20,11 @@ class ProjectStoreBase extends Store protected $modelName = '\PHPCI\Model\Project'; protected $primaryKey = 'id'; - /** - * Get a Project by primary key. - * @param mixed $value Primary key. - * @param string $useConnection Connection to use (read / write) - * @return \PHPCI\Model\Project|null - */ public function getByPrimaryKey($value, $useConnection = 'read') { return $this->getById($value, $useConnection); } - /** - * Get a Project by Id. - * @param mixed $value. - * @param string $useConnection Connection to use (read / write) - * @throws \b8\Exception\HttpException - * @return \PHPCI\Model\Project|null; - */ public function getById($value, $useConnection = 'read') { if (is_null($value)) { @@ -57,31 +44,17 @@ class ProjectStoreBase extends Store return null; } - /** - * Get an array of Project by Title. - * @param mixed $value. - * @param int $limit - * @param string $useConnection Connection to use (read / write) - * @throws \b8\Exception\HttpException - * @return \PHPCI\Model\Project[] - */ - public function getByTitle($value, $limit = null, $useConnection = 'read') + public function getByTitle($value, $limit = 1000, $useConnection = 'read') { if (is_null($value)) { throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.'); } - $add = ''; - if ($limit) { - $add .= ' LIMIT ' . $limit; - } - - $count = null; - - $query = 'SELECT * FROM `project` WHERE `title` = :title' . $add; + $query = 'SELECT * FROM `project` WHERE `title` = :title LIMIT :limit'; $stmt = Database::getConnection($useConnection)->prepare($query); $stmt->bindValue(':title', $value); + $stmt->bindValue(':limit', (int)$limit, \PDO::PARAM_INT); if ($stmt->execute()) { $res = $stmt->fetchAll(\PDO::FETCH_ASSOC); @@ -91,6 +64,8 @@ class ProjectStoreBase extends Store }; $rtn = array_map($map, $res); + $count = count($rtn); + return array('items' => $rtn, 'count' => $count); } else { return array('items' => array(), 'count' => 0); diff --git a/PHPCI/Store/Base/UserStoreBase.php b/PHPCI/Store/Base/UserStoreBase.php index 24d247e3..fd903d8e 100644 --- a/PHPCI/Store/Base/UserStoreBase.php +++ b/PHPCI/Store/Base/UserStoreBase.php @@ -20,24 +20,11 @@ class UserStoreBase extends Store protected $modelName = '\PHPCI\Model\User'; protected $primaryKey = 'id'; - /** - * Get a User by primary key. - * @param mixed $value Primary key. - * @param string $useConnection Connection to use (read / write) - * @return \PHPCI\Model\User|null - */ public function getByPrimaryKey($value, $useConnection = 'read') { return $this->getById($value, $useConnection); } - /** - * Get a User by Id. - * @param mixed $value. - * @param string $useConnection Connection to use (read / write) - * @throws \b8\Exception\HttpException - * @return \PHPCI\Model\User|null; - */ public function getById($value, $useConnection = 'read') { if (is_null($value)) { @@ -57,13 +44,6 @@ class UserStoreBase extends Store return null; } - /** - * Get a User by Email. - * @param mixed $value. - * @param string $useConnection Connection to use (read / write) - * @throws \b8\Exception\HttpException - * @return \PHPCI\Model\User|null; - */ public function getByEmail($value, $useConnection = 'read') { if (is_null($value)) { From a4339fc1b6dd7663dc01f16c6f9e05a332856ebe Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 12 Feb 2015 11:38:00 +0000 Subject: [PATCH 078/329] Fixing two particularly dodgy queries in BuildStore. --- PHPCI/Store/BuildStore.php | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/PHPCI/Store/BuildStore.php b/PHPCI/Store/BuildStore.php index 39ff7c78..96631e1e 100644 --- a/PHPCI/Store/BuildStore.php +++ b/PHPCI/Store/BuildStore.php @@ -30,13 +30,12 @@ class BuildStore extends BuildStoreBase */ public function getLatestBuilds($projectId = null, $limit = 5) { - $where = ''; - if (!is_null($projectId)) { - $where = ' WHERE `project_id` = :pid '; + $query = 'SELECT * FROM build WHERE `project_id` = :pid ORDER BY id DESC LIMIT :limit'; + } else { + $query = 'SELECT * FROM build ORDER BY id DESC LIMIT :limit'; } - $query = 'SELECT * FROM build '.$where.' ORDER BY id DESC LIMIT :limit'; $stmt = Database::getConnection('read')->prepare($query); if (!is_null($projectId)) { @@ -120,17 +119,26 @@ class BuildStore extends BuildStoreBase */ public function getMeta($key, $projectId, $buildId = null, $branch = null, $numResults = 1) { - $select = '`bm`.`build_id`, `bm`.`meta_key`, `bm`.`meta_value`'; - $and = $numResults > 1 ? ' AND (`bm`.`build_id` <= :buildId) ' : ' AND (`bm`.`build_id` = :buildId) '; - $where = '`bm`.`meta_key` = :key AND `bm`.`project_id` = :projectId ' . $and; - $from = ' `build_meta` AS `bm`'; + $query = 'SELECT bm.build_id, bm.meta_key, bm.meta_value + FROM build_meta AS bm + LEFT JOIN build b ON b.id = bm.build_id + WHERE bm.meta_key = :key + AND bm.project_id = :projectId'; - if ($branch !== null) { - $where .= ' AND `b`.`branch` = :branch AND `b`.`id`= `bm`.`build_id` '; - $from .= ', `build` AS `b`'; + // If we're getting comparative meta data, include previous builds + // otherwise just include the specified build ID: + if ($numResults > 1) { + $query .= ' AND bm.build_id <= :buildId '; + } else { + $query .= ' AND bm.build_id = :buildId '; } - $query = 'SELECT '.$select.' FROM '.$from.' WHERE '.$where.' ORDER BY `bm`.id DESC LIMIT :numResults'; + // Include specific branch information if required: + if (!is_null($branch)) { + $query .= ' AND b.branch = :branch '; + } + + $query .= ' ORDER BY bm.id DESC LIMIT :numResults'; $stmt = Database::getConnection('read')->prepare($query); $stmt->bindValue(':key', $key, \PDO::PARAM_STR); From e5cbccecb5bf8a0a5171390c033bf01a7858eeaf Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 12 Feb 2015 11:41:58 +0000 Subject: [PATCH 079/329] Getting rid of debug code --- public/index.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/public/index.php b/public/index.php index 94191794..4d68e76b 100644 --- a/public/index.php +++ b/public/index.php @@ -9,9 +9,6 @@ session_start(); -error_reporting(E_ALL); -ini_set('display_errors', 'on'); - require_once('../bootstrap.php'); $fc = new PHPCI\Application($config, new b8\Http\Request()); From 36e3c622c83e33413236a45e0b334abc4223365f Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 12 Feb 2015 11:42:09 +0000 Subject: [PATCH 080/329] Fixing missing use statements --- PHPCI/Controller.php | 1 + PHPCI/Logging/BuildDBLogHandler.php | 1 + PHPCI/Plugin/Atoum.php | 1 + 3 files changed, 3 insertions(+) diff --git a/PHPCI/Controller.php b/PHPCI/Controller.php index 5fd22594..4f941251 100644 --- a/PHPCI/Controller.php +++ b/PHPCI/Controller.php @@ -10,6 +10,7 @@ namespace PHPCI; use b8\Config; +use b8\Exception\HttpException\ForbiddenException; use b8\Http\Request; use b8\Http\Response; use b8\View; diff --git a/PHPCI/Logging/BuildDBLogHandler.php b/PHPCI/Logging/BuildDBLogHandler.php index bda8cfce..91664b25 100644 --- a/PHPCI/Logging/BuildDBLogHandler.php +++ b/PHPCI/Logging/BuildDBLogHandler.php @@ -12,6 +12,7 @@ namespace PHPCI\Logging; use b8\Store\Factory; use Monolog\Handler\AbstractProcessingHandler; use PHPCI\Model\Build; +use Psr\Log\LogLevel; /** * Class BuildDBLogHandler writes the build log to the database. diff --git a/PHPCI/Plugin/Atoum.php b/PHPCI/Plugin/Atoum.php index 8abc871e..877f009b 100644 --- a/PHPCI/Plugin/Atoum.php +++ b/PHPCI/Plugin/Atoum.php @@ -10,6 +10,7 @@ namespace PHPCI\Plugin; use PHPCI\Builder; +use PHPCI\Helper\Lang; use PHPCI\Model\Build; /** From 489f71b8c2d96e6304e11882aa55a823c70d4cfd Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 12 Feb 2015 12:37:56 +0000 Subject: [PATCH 081/329] Cleaning up unnecessary use of 'die' and 'exit' --- PHPCI/Command/InstallCommand.php | 10 ++- PHPCI/Command/PollCommand.php | 2 +- PHPCI/Command/UpdateCommand.php | 10 ++- PHPCI/Controller.php | 4 ++ PHPCI/Controller/BuildController.php | 37 +++++++---- PHPCI/Controller/BuildStatusController.php | 9 ++- PHPCI/Controller/HomeController.php | 6 +- PHPCI/Controller/PluginController.php | 23 ++++--- PHPCI/Controller/ProjectController.php | 35 ++++++---- PHPCI/Controller/SessionController.php | 16 +++-- PHPCI/Controller/SettingsController.php | 51 +++++++++------ PHPCI/Controller/UserController.php | 15 +++-- PHPCI/Controller/WebhookController.php | 76 ++++++++++++---------- 13 files changed, 188 insertions(+), 106 deletions(-) diff --git a/PHPCI/Command/InstallCommand.php b/PHPCI/Command/InstallCommand.php index 3dab656b..77b6b962 100644 --- a/PHPCI/Command/InstallCommand.php +++ b/PHPCI/Command/InstallCommand.php @@ -59,7 +59,9 @@ class InstallCommand extends Command { $this->configFilePath = $input->getOption('config-path'); - $this->verifyNotInstalled($output); + if (!$this->verifyNotInstalled($output)) { + return; + } $output->writeln(''); $output->writeln('******************'); @@ -346,7 +348,6 @@ class InstallCommand extends Command } catch (\Exception $ex) { $output->writeln(''.Lang::get('failed_to_create').''); $output->writeln('' . $ex->getMessage() . ''); - die; } } @@ -361,6 +362,7 @@ class InstallCommand extends Command /** * @param OutputInterface $output + * @return bool */ protected function verifyNotInstalled(OutputInterface $output) { @@ -370,8 +372,10 @@ class InstallCommand extends Command if (!empty($content)) { $output->writeln(''.Lang::get('config_exists').''); $output->writeln(''.Lang::get('update_instead').''); - die; + return false; } } + + return true; } } diff --git a/PHPCI/Command/PollCommand.php b/PHPCI/Command/PollCommand.php index 07b628b8..42a07067 100644 --- a/PHPCI/Command/PollCommand.php +++ b/PHPCI/Command/PollCommand.php @@ -60,7 +60,7 @@ class PollCommand extends Command if (!$token) { $this->logger->error(Lang::get('no_token')); - exit(); + return; } $buildStore = Factory::getStore('Build'); diff --git a/PHPCI/Command/UpdateCommand.php b/PHPCI/Command/UpdateCommand.php index 32ce09b2..1ca1341d 100644 --- a/PHPCI/Command/UpdateCommand.php +++ b/PHPCI/Command/UpdateCommand.php @@ -49,7 +49,9 @@ class UpdateCommand extends Command */ protected function execute(InputInterface $input, OutputInterface $output) { - $this->verifyInstalled($output); + if (!$this->verifyInstalled($output)) { + return; + } $output->write(Lang::get('updating_phpci')); @@ -63,14 +65,16 @@ class UpdateCommand extends Command if (!file_exists(PHPCI_DIR . 'PHPCI/config.yml')) { $output->writeln(''.Lang::get('not_installed').''); $output->writeln(''.Lang::get('install_instead').''); - die; + return false; } $content = file_get_contents(PHPCI_DIR . 'PHPCI/config.yml'); if (empty($content)) { $output->writeln(''.Lang::get('not_installed').''); $output->writeln(''.Lang::get('install_instead').''); - die; + return false; } + + return true; } } diff --git a/PHPCI/Controller.php b/PHPCI/Controller.php index 4f941251..68b1c845 100644 --- a/PHPCI/Controller.php +++ b/PHPCI/Controller.php @@ -92,6 +92,10 @@ class Controller extends \b8\Controller $this->setView($action); $response = parent::handleAction($action, $actionParams); + if ($response instanceof Response) { + return $response; + } + if (is_string($response)) { $this->controllerView->content = $response; } elseif (isset($this->view)) { diff --git a/PHPCI/Controller/BuildController.php b/PHPCI/Controller/BuildController.php index d552f5b3..bf898d2d 100644 --- a/PHPCI/Controller/BuildController.php +++ b/PHPCI/Controller/BuildController.php @@ -11,6 +11,7 @@ namespace PHPCI\Controller; use b8; use b8\Exception\HttpException\NotFoundException; +use b8\Http\Response\JsonResponse; use PHPCI\BuildFactory; use PHPCI\Helper\Lang; use PHPCI\Model\Build; @@ -61,7 +62,7 @@ class BuildController extends \PHPCI\Controller $this->view->plugins = $this->getUiPlugins(); $this->view->build = $build; - $this->view->data = $this->getBuildData($build); + $this->view->data = json_encode($this->getBuildData($build)); $this->layout->title = Lang::get('build_n', $buildId); $this->layout->subtitle = $build->getProjectTitle(); @@ -107,7 +108,17 @@ class BuildController extends \PHPCI\Controller */ public function data($buildId) { - die($this->getBuildData(BuildFactory::getBuildById($buildId))); + $response = new JsonResponse(); + $build = BuildFactory::getBuildById($buildId); + + if (!$build) { + $response->setResponseCode(404); + $response->setContent(array()); + return $response; + } + + $response->setContent($this->getBuildData($build)); + return $response; } /** @@ -124,7 +135,9 @@ class BuildController extends \PHPCI\Controller $data = $this->buildStore->getMeta($key, $build->getProjectId(), $buildId, $build->getBranch(), $numBuilds); } - die(json_encode($data)); + $response = new JsonResponse(); + $response->setContent($data); + return $response; } /** @@ -139,7 +152,7 @@ class BuildController extends \PHPCI\Controller $data['started'] = !is_null($build->getStarted()) ? $build->getStarted()->format('Y-m-d H:i:s') : null; $data['finished'] = !is_null($build->getFinished()) ? $build->getFinished()->format('Y-m-d H:i:s') : null; - return json_encode($data); + return $data; } /** @@ -155,8 +168,9 @@ class BuildController extends \PHPCI\Controller $build = $this->buildService->createDuplicateBuild($copy); - header('Location: '.PHPCI_URL.'build/view/' . $build->getId()); - exit; + $response = new b8\Http\Response\RedirectResponse(); + $response->setHeader('Location', PHPCI_URL.'build/view/' . $build->getId()); + return $response; } /** @@ -174,8 +188,9 @@ class BuildController extends \PHPCI\Controller $this->buildService->deleteBuild($build); - header('Location: '.PHPCI_URL.'project/view/' . $build->getProjectId()); - exit; + $response = new b8\Http\Response\RedirectResponse(); + $response->setHeader('Location', PHPCI_URL.'project/view/' . $build->getProjectId()); + return $response; } /** @@ -200,9 +215,9 @@ class BuildController extends \PHPCI\Controller 'running' => $this->formatBuilds($this->buildStore->getByStatus(Build::STATUS_RUNNING)), ); - if ($this->request->isAjax()) { - die(json_encode($rtn)); - } + $response = new JsonResponse(); + $response->setContent($rtn); + return $response; } /** diff --git a/PHPCI/Controller/BuildStatusController.php b/PHPCI/Controller/BuildStatusController.php index 71ad1e11..13b68cd8 100644 --- a/PHPCI/Controller/BuildStatusController.php +++ b/PHPCI/Controller/BuildStatusController.php @@ -53,7 +53,7 @@ class BuildStatusController extends \PHPCI\Controller $status = 'passing'; if (!$project->getAllowPublicStatus()) { - die(); + return null; } if (isset($project) && $project instanceof Project) { @@ -76,6 +76,13 @@ class BuildStatusController extends \PHPCI\Controller public function image($projectId) { $status = $this->getStatus($projectId); + + if (is_null($status)) { + $response = new b8\Http\Response\RedirectResponse(); + $response->setHeader('Location', '/'); + return $response; + } + $color = ($status == 'passing') ? 'green' : 'red'; header('Content-Type: image/svg+xml'); diff --git a/PHPCI/Controller/HomeController.php b/PHPCI/Controller/HomeController.php index 20d4cead..c48f40ee 100644 --- a/PHPCI/Controller/HomeController.php +++ b/PHPCI/Controller/HomeController.php @@ -68,7 +68,8 @@ class HomeController extends \PHPCI\Controller */ public function latest() { - die($this->getLatestBuildsHtml()); + $this->response->setContent($this->getLatestBuildsHtml()); + return $this->response; } /** @@ -77,7 +78,8 @@ class HomeController extends \PHPCI\Controller public function summary() { $projects = $this->projectStore->getWhere(array(), 50, 0, array(), array('title' => 'ASC')); - die($this->getSummaryHtml($projects)); + $this->response->setContent($this->getSummaryHtml($projects)); + return $this->response; } /** diff --git a/PHPCI/Controller/PluginController.php b/PHPCI/Controller/PluginController.php index ac829f7f..a090798e 100644 --- a/PHPCI/Controller/PluginController.php +++ b/PHPCI/Controller/PluginController.php @@ -82,16 +82,18 @@ class PluginController extends \PHPCI\Controller $package = $this->getParam('package', null); $json = $this->getComposerJson(); + $response = new b8\Http\Response\RedirectResponse(); + if (!in_array($package, $this->required)) { unset($json['require'][$package]); $this->setComposerJson($json); - header('Location: ' . PHPCI_URL . 'plugin?r=' . $package); - die; + $response->setHeader('Location', PHPCI_URL . 'plugin?r=' . $package); + return $response; } - header('Location: ' . PHPCI_URL); - die; + $response->setHeader('Location', PHPCI_URL); + return $response; } /** @@ -108,8 +110,9 @@ class PluginController extends \PHPCI\Controller $json['require'][$package] = $version; $this->setComposerJson($json); - header('Location: ' . PHPCI_URL . 'plugin?w=' . $package); - die; + $response = new b8\Http\Response\RedirectResponse(); + $response->setHeader('Location', PHPCI_URL . 'plugin?w=' . $package); + return $response; } /** @@ -181,7 +184,9 @@ class PluginController extends \PHPCI\Controller $http->setHeaders(array('User-Agent: PHPCI/1.0 (+https://www.phptesting.org)')); $res = $http->get('https://packagist.org/search.json', array('q' => $searchQuery)); - die(json_encode($res['body'])); + $response = new b8\Http\Response\JsonResponse(); + $response->setContent($res['body']); + return $response; } /** @@ -194,6 +199,8 @@ class PluginController extends \PHPCI\Controller $http->setHeaders(array('User-Agent: PHPCI/1.0 (+https://www.phptesting.org)')); $res = $http->get('https://packagist.org/packages/'.$name.'.json'); - die(json_encode($res['body'])); + $response = new b8\Http\Response\JsonResponse(); + $response->setContent($res['body']); + return $response; } } diff --git a/PHPCI/Controller/ProjectController.php b/PHPCI/Controller/ProjectController.php index 01900aa0..5a914adf 100644 --- a/PHPCI/Controller/ProjectController.php +++ b/PHPCI/Controller/ProjectController.php @@ -81,8 +81,9 @@ class ProjectController extends \PHPCI\Controller $pages = $builds[1] == 0 ? 1 : ceil($builds[1] / $per_page); if ($page > $pages) { - header('Location: '.PHPCI_URL.'project/view/'.$projectId); - die; + $response = new b8\Http\Response\RedirectResponse(); + $response->setHeader('Location', PHPCI_URL.'project/view/'.$projectId); + return $response; } $this->view->builds = $builds[0]; @@ -118,8 +119,9 @@ class ProjectController extends \PHPCI\Controller $email = $_SESSION['phpci_user']->getEmail(); $build = $this->buildService->createBuild($project, null, urldecode($branch), $email); - header('Location: '.PHPCI_URL.'build/view/' . $build->getId()); - exit; + $response = new b8\Http\Response\RedirectResponse(); + $response->setHeader('Location', PHPCI_URL.'build/view/' . $build->getId()); + return $response; } /** @@ -132,8 +134,9 @@ class ProjectController extends \PHPCI\Controller $project = $this->projectStore->getById($projectId); $this->projectService->deleteProject($project); - header('Location: '.PHPCI_URL); - exit; + $response = new b8\Http\Response\RedirectResponse(); + $response->setHeader('Location', PHPCI_URL); + return $response; } /** @@ -143,7 +146,9 @@ class ProjectController extends \PHPCI\Controller { $branch = $this->getParam('branch', ''); $builds = $this->getLatestBuildsHtml($projectId, urldecode($branch)); - die($builds[0]); + + $this->response->setContent($builds[0]); + return $this->response; } /** @@ -220,8 +225,10 @@ class ProjectController extends \PHPCI\Controller ); $project = $this->projectService->createProject($title, $type, $reference, $options); - header('Location: '.PHPCI_URL.'project/view/' . $project->getId()); - die; + + $response = new b8\Http\Response\RedirectResponse(); + $response->setHeader('Location', PHPCI_URL.'project/view/' . $project->getId()); + return $response; } } @@ -282,8 +289,9 @@ class ProjectController extends \PHPCI\Controller $project = $this->projectService->updateProject($project, $title, $type, $reference, $options); - header('Location: '.PHPCI_URL.'project/view/' . $project->getId()); - die; + $response = new b8\Http\Response\RedirectResponse(); + $response->setHeader('Location', PHPCI_URL.'project/view/' . $project->getId()); + return $response; } /** @@ -366,7 +374,10 @@ class ProjectController extends \PHPCI\Controller protected function githubRepositories() { $github = new Github(); - die(json_encode($github->getRepositories())); + + $response = new b8\Http\Response\JsonResponse(); + $response->setContent($github->getRepositories()); + return $response; } /** diff --git a/PHPCI/Controller/SessionController.php b/PHPCI/Controller/SessionController.php index c5f8b962..540b043f 100644 --- a/PHPCI/Controller/SessionController.php +++ b/PHPCI/Controller/SessionController.php @@ -47,8 +47,9 @@ class SessionController extends \PHPCI\Controller if ($user && password_verify($this->getParam('password', ''), $user->getHash())) { $_SESSION['phpci_user_id'] = $user->getId(); - header('Location: ' . $this->getLoginRedirect()); - die; + $response = new b8\Http\Response\RedirectResponse(); + $response->setHeader('Location', $this->getLoginRedirect()); + return $response; } else { $isLoginFailure = true; } @@ -92,8 +93,10 @@ class SessionController extends \PHPCI\Controller unset($_SESSION['phpci_user_id']); session_destroy(); - header('Location: ' . PHPCI_URL); - die; + + $response = new b8\Http\Response\RedirectResponse(); + $response->setHeader('Location', PHPCI_URL); + return $response; } /** @@ -151,8 +154,9 @@ class SessionController extends \PHPCI\Controller $_SESSION['phpci_user'] = $this->userStore->save($user); $_SESSION['phpci_user_id'] = $user->getId(); - header('Location: ' . PHPCI_URL); - die; + $response = new b8\Http\Response\RedirectResponse(); + $response->setHeader('Location', PHPCI_URL); + return $response; } $this->view->id = $userId; diff --git a/PHPCI/Controller/SettingsController.php b/PHPCI/Controller/SettingsController.php index 72df7c95..ba9b0141 100644 --- a/PHPCI/Controller/SettingsController.php +++ b/PHPCI/Controller/SettingsController.php @@ -102,13 +102,15 @@ class SettingsController extends Controller $this->settings['phpci']['github']['secret'] = $this->getParam('githubsecret', ''); $error = $this->storeSettings(); + $response = new b8\Http\Response\RedirectResponse(); + if ($error) { - header('Location: ' . PHPCI_URL . 'settings?saved=2'); + $response->setHeader('Location', PHPCI_URL . 'settings?saved=2'); } else { - header('Location: ' . PHPCI_URL . 'settings?saved=1'); + $response->setHeader('Location', PHPCI_URL . 'settings?saved=1'); } - die; + return $response; } /** @@ -123,13 +125,15 @@ class SettingsController extends Controller $error = $this->storeSettings(); + $response = new b8\Http\Response\RedirectResponse(); + if ($error) { - header('Location: ' . PHPCI_URL . 'settings?saved=2'); + $response->setHeader('Location', PHPCI_URL . 'settings?saved=2'); } else { - header('Location: ' . PHPCI_URL . 'settings?saved=1'); + $response->setHeader('Location', PHPCI_URL . 'settings?saved=1'); } - die; + return $response; } /** @@ -143,13 +147,15 @@ class SettingsController extends Controller $error = $this->storeSettings(); + $response = new b8\Http\Response\RedirectResponse(); + if ($error) { - header('Location: ' . PHPCI_URL . 'settings?saved=2'); + $response->setHeader('Location', PHPCI_URL . 'settings?saved=2'); } else { - header('Location: ' . PHPCI_URL . 'settings?saved=1'); + $response->setHeader('Location', PHPCI_URL . 'settings?saved=1'); } - die; + return $response; } /** @@ -162,13 +168,15 @@ class SettingsController extends Controller $this->settings['phpci']['basic'] = $this->getParams(); $error = $this->storeSettings(); + $response = new b8\Http\Response\RedirectResponse(); + if ($error) { - header('Location: ' . PHPCI_URL . 'settings?saved=2'); + $response->setHeader('Location', PHPCI_URL . 'settings?saved=2'); } else { - header('Location: ' . PHPCI_URL . 'settings?saved=1'); + $response->setHeader('Location', PHPCI_URL . 'settings?saved=1'); } - die; + return $response; } /** @@ -183,13 +191,15 @@ class SettingsController extends Controller $error = $this->storeSettings(); + $response = new b8\Http\Response\RedirectResponse(); + if ($error) { - header('Location: ' . PHPCI_URL . 'settings?saved=2'); + $response->setHeader('Location', PHPCI_URL . 'settings?saved=2'); } else { - header('Location: ' . PHPCI_URL . 'settings?saved=1'); + $response->setHeader('Location', PHPCI_URL . 'settings?saved=1'); } - die; + return $response; } /** @@ -212,14 +222,15 @@ class SettingsController extends Controller $this->settings['phpci']['github']['token'] = $resp['access_token']; $this->storeSettings(); - header('Location: ' . PHPCI_URL . 'settings?linked=1'); - die; + $response = new b8\Http\Response\RedirectResponse(); + $response->setHeader('Location', PHPCI_URL . 'settings?linked=1'); + return $response; } } - - header('Location: ' . PHPCI_URL . 'settings?linked=2'); - die; + $response = new b8\Http\Response\RedirectResponse(); + $response->setHeader('Location', PHPCI_URL . 'settings?linked=2'); + return $response; } /** diff --git a/PHPCI/Controller/UserController.php b/PHPCI/Controller/UserController.php index 7710c503..48092ad5 100644 --- a/PHPCI/Controller/UserController.php +++ b/PHPCI/Controller/UserController.php @@ -175,8 +175,9 @@ class UserController extends Controller $this->userService->createUser($name, $email, $password, $isAdmin); - header('Location: '.PHPCI_URL.'user'); - die; + $response = new b8\Http\Response\RedirectResponse(); + $response->setHeader('Location', PHPCI_URL . 'user'); + return $response; } /** @@ -215,8 +216,9 @@ class UserController extends Controller $this->userService->updateUser($user, $name, $email, $password, $isAdmin); - header('Location: '.PHPCI_URL.'user'); - die; + $response = new b8\Http\Response\RedirectResponse(); + $response->setHeader('Location', PHPCI_URL . 'user'); + return $response; } /** @@ -288,7 +290,8 @@ class UserController extends Controller $this->userService->deleteUser($user); - header('Location: '.PHPCI_URL.'user'); - die; + $response = new b8\Http\Response\RedirectResponse(); + $response->setHeader('Location', PHPCI_URL . 'user'); + return $response; } } diff --git a/PHPCI/Controller/WebhookController.php b/PHPCI/Controller/WebhookController.php index a7652971..5ce4849b 100644 --- a/PHPCI/Controller/WebhookController.php +++ b/PHPCI/Controller/WebhookController.php @@ -55,6 +55,9 @@ class WebhookController extends \PHPCI\Controller */ public function bitbucket($project) { + $response = new b8\Http\Response\JsonResponse(); + $response->setContent(array('status' => 'ok')); + $payload = json_decode($this->getParam('payload'), true); foreach ($payload['commits'] as $commit) { @@ -65,13 +68,13 @@ class WebhookController extends \PHPCI\Controller $this->createBuild($project, $commit['raw_node'], $commit['branch'], $email, $commit['message']); } catch (\Exception $ex) { - header('HTTP/1.1 500 Internal Server Error'); - header('Ex: ' . $ex->getMessage()); - die('FAIL'); + $response->setResponseCode(500); + $response->setContent(array('status' => 'failed', 'error' => $ex->getMessage())); + break; } } - die('OK'); + return $response; } /** @@ -81,6 +84,9 @@ class WebhookController extends \PHPCI\Controller */ public function git($project) { + $response = new b8\Http\Response\JsonResponse(); + $response->setContent(array('status' => 'ok')); + $branch = $this->getParam('branch'); $commit = $this->getParam('commit'); $commitMessage = $this->getParam('message'); @@ -105,12 +111,11 @@ class WebhookController extends \PHPCI\Controller $this->createBuild($project, $commit, $branch, $committer, $commitMessage); } catch (\Exception $ex) { - header('HTTP/1.1 400 Bad Request'); - header('Ex: ' . $ex->getMessage()); - die('FAIL'); + $response->setResponseCode(500); + $response->setContent(array('status' => 'failed', 'error' => $ex->getMessage())); } - die('OK'); + return $response; } /** @@ -118,6 +123,9 @@ class WebhookController extends \PHPCI\Controller */ public function github($project) { + $response = new b8\Http\Response\JsonResponse(); + $response->setContent(array('status' => 'ok')); + switch ($_SERVER['CONTENT_TYPE']) { case 'application/json': $payload = json_decode(file_get_contents('php://input'), true); @@ -128,22 +136,22 @@ class WebhookController extends \PHPCI\Controller break; default: - header('HTTP/1.1 400 Bad Request'); - die('Request content type not supported'); + $response->setResponseCode(401); + $response->setContent(array('status' => 'failed', 'error' => 'Content type not supported.')); + return $response; } // Handle Pull Request web hooks: if (array_key_exists('pull_request', $payload)) { - return $this->githubPullRequest($project, $payload); + return $this->githubPullRequest($project, $payload, $response); } // Handle Push web hooks: if (array_key_exists('commits', $payload)) { - return $this->githubCommitRequest($project, $payload); + return $this->githubCommitRequest($project, $payload, $response); } - header('HTTP/1.1 200 OK'); - die('This request type is not supported, this is not an error.'); + return $response; } /** @@ -151,12 +159,12 @@ class WebhookController extends \PHPCI\Controller * @param $project * @param array $payload */ - protected function githubCommitRequest($project, array $payload) + protected function githubCommitRequest($project, array $payload, b8\Http\Response\JsonResponse $response) { // Github sends a payload when you close a pull request with a // non-existant commit. We don't want this. if (array_key_exists('after', $payload) && $payload['after'] === '0000000000000000000000000000000000000000') { - die('OK'); + return $response; } try { @@ -182,12 +190,12 @@ class WebhookController extends \PHPCI\Controller } } catch (\Exception $ex) { - header('HTTP/1.1 500 Internal Server Error'); - header('Ex: ' . $ex->getMessage()); - die('FAIL'); + $response->setResponseCode(500); + $response->setContent(array('status' => 'failed', 'error' => $ex->getMessage())); + } - die('OK'); + return $response; } /** @@ -195,11 +203,11 @@ class WebhookController extends \PHPCI\Controller * @param $projectId * @param array $payload */ - protected function githubPullRequest($projectId, array $payload) + protected function githubPullRequest($projectId, array $payload, b8\Http\Response\JsonResponse $response) { // We only want to know about open pull requests: if (!in_array($payload['action'], array('opened', 'synchronize', 'reopened'))) { - die('OK'); + return $response; } try { @@ -217,9 +225,10 @@ class WebhookController extends \PHPCI\Controller // Check we got a success response: if (!$response['success']) { - header('HTTP/1.1 500 Internal Server Error'); - header('Ex: Could not get commits, failed API request.'); - die('FAIL'); + $message = 'Could not get commits, failed API request.'; + $response->setResponseCode(500); + $response->setContent(array('status' => 'failed', 'error' => $message)); + return $response; } foreach ($response['body'] as $commit) { @@ -238,12 +247,11 @@ class WebhookController extends \PHPCI\Controller $this->createBuild($projectId, $commit['sha'], $branch, $committer, $message, $extra); } } catch (\Exception $ex) { - header('HTTP/1.1 500 Internal Server Error'); - header('Ex: ' . $ex->getMessage()); - die('FAIL'); + $response->setResponseCode(500); + $response->setContent(array('status' => 'failed', 'error' => $ex->getMessage())); } - die('OK'); + return $response; } /** @@ -251,6 +259,9 @@ class WebhookController extends \PHPCI\Controller */ public function gitlab($project) { + $response = new b8\Http\Response\JsonResponse(); + $response->setContent(array('status' => 'ok')); + $payloadString = file_get_contents("php://input"); $payload = json_decode($payloadString, true); @@ -282,12 +293,11 @@ class WebhookController extends \PHPCI\Controller } } catch (\Exception $ex) { - header('HTTP/1.1 500 Internal Server Error'); - header('Ex: ' . $ex->getMessage()); - die('FAIL'); + $response->setResponseCode(500); + $response->setContent(array('status' => 'failed', 'error' => $ex->getMessage())); } - die('OK'); + return $response; } /** From c9864058616cf560662ea48752d679368d2e6d39 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 12 Feb 2015 12:38:22 +0000 Subject: [PATCH 082/329] Removing the now-unnecessary JSON.parse() call --- public/assets/js/phpci.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/assets/js/phpci.js b/public/assets/js/phpci.js index 7e0b0f8b..a2d5954c 100644 --- a/public/assets/js/phpci.js +++ b/public/assets/js/phpci.js @@ -33,7 +33,7 @@ var PHPCI = { url: PHPCI_URL + 'build/latest', success: function (data) { - $(window).trigger('builds-updated', [JSON.parse(data)]); + $(window).trigger('builds-updated', [data]); }, error: PHPCI.handleFailedAjax From 54ab93373ddd44b5f53a3ee987a9578f39bb5fd2 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 12 Feb 2015 13:17:42 +0000 Subject: [PATCH 083/329] Fixing some bugs related to the last round of changes. --- PHPCI/Controller/ProjectController.php | 1 + PHPCI/View/Home/index.phtml | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/PHPCI/Controller/ProjectController.php b/PHPCI/Controller/ProjectController.php index 5a914adf..e1aaa6cb 100644 --- a/PHPCI/Controller/ProjectController.php +++ b/PHPCI/Controller/ProjectController.php @@ -147,6 +147,7 @@ class ProjectController extends \PHPCI\Controller $branch = $this->getParam('branch', ''); $builds = $this->getLatestBuildsHtml($projectId, urldecode($branch)); + $this->response->disableLayout(); $this->response->setContent($builds[0]); return $this->response; } diff --git a/PHPCI/View/Home/index.phtml b/PHPCI/View/Home/index.phtml index 6e27bb79..251bb9ee 100644 --- a/PHPCI/View/Home/index.phtml +++ b/PHPCI/View/Home/index.phtml @@ -17,7 +17,6 @@ getStatus()) { case \PHPCI\Model\Build::STATUS_NEW: $updated = $build->getCreated(); @@ -44,6 +43,10 @@ break; } + if (!$updated) { + $updated = $build->getCreated(); + } + if ($updated->format('Y-m-d') != $last->format('Y-m-d')): $last = $updated; ?>
  • From 320b0efa7175b0271f1323553ab208615626843e Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 12 Feb 2015 13:17:50 +0000 Subject: [PATCH 084/329] Fixing run-builds. --- PHPCI/Command/RunCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Command/RunCommand.php b/PHPCI/Command/RunCommand.php index e0f37b6b..63e38b2d 100644 --- a/PHPCI/Command/RunCommand.php +++ b/PHPCI/Command/RunCommand.php @@ -47,7 +47,7 @@ class RunCommand extends Command /** * @var int */ - protected $maxBuilds = null; + protected $maxBuilds = 100; /** * @var bool From dea615bf26338b3a197fe8912303f12c7e4ec256 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 12 Feb 2015 13:20:08 +0000 Subject: [PATCH 085/329] Cleanup --- PHPCI/Controller/HomeController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/PHPCI/Controller/HomeController.php b/PHPCI/Controller/HomeController.php index c48f40ee..65abf79a 100644 --- a/PHPCI/Controller/HomeController.php +++ b/PHPCI/Controller/HomeController.php @@ -68,6 +68,7 @@ class HomeController extends \PHPCI\Controller */ public function latest() { + $this->response->disableLayout(); $this->response->setContent($this->getLatestBuildsHtml()); return $this->response; } @@ -77,6 +78,7 @@ class HomeController extends \PHPCI\Controller */ public function summary() { + $this->response->disableLayout(); $projects = $this->projectStore->getWhere(array(), 50, 0, array(), array('title' => 'ASC')); $this->response->setContent($this->getSummaryHtml($projects)); return $this->response; From dcbad55df8c04e9c0d1ab36feba7c543e3eeddfa Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 12 Feb 2015 13:30:32 +0000 Subject: [PATCH 086/329] Fixing FIXMEs --- PHPCI/Controller/BuildStatusController.php | 9 ++++++--- PHPCI/Helper/Github.php | 2 +- PHPCI/Plugin/PhpTalLint.php | 2 -- PHPCI/Plugin/SlackNotify.php | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/PHPCI/Controller/BuildStatusController.php b/PHPCI/Controller/BuildStatusController.php index 13b68cd8..06f9400b 100644 --- a/PHPCI/Controller/BuildStatusController.php +++ b/PHPCI/Controller/BuildStatusController.php @@ -84,9 +84,12 @@ class BuildStatusController extends \PHPCI\Controller } $color = ($status == 'passing') ? 'green' : 'red'; - - header('Content-Type: image/svg+xml'); - die(file_get_contents('http://img.shields.io/badge/build-' . $status . '-' . $color . '.svg')); + $image = file_get_contents('http://img.shields.io/badge/build-' . $status . '-' . $color . '.svg'); + + $this->response->disableLayout(); + $this->response->setHeader('Content-Type', 'image/svg+xml'); + $this->response->setContent($image); + return $this->response; } /** diff --git a/PHPCI/Helper/Github.php b/PHPCI/Helper/Github.php index b83b06c3..a791601e 100644 --- a/PHPCI/Helper/Github.php +++ b/PHPCI/Helper/Github.php @@ -79,7 +79,7 @@ class Github $token = Config::getInstance()->get('phpci.github.token'); if (!$token) { - die(json_encode(null)); + return null; } $cache = Cache::getCache(Cache::TYPE_APC); diff --git a/PHPCI/Plugin/PhpTalLint.php b/PHPCI/Plugin/PhpTalLint.php index 01e70b3e..146b0479 100644 --- a/PHPCI/Plugin/PhpTalLint.php +++ b/PHPCI/Plugin/PhpTalLint.php @@ -202,7 +202,6 @@ class PhpTalLint implements PHPCI\Plugin list($suffixes, $tales) = $this->getFlags(); - // FIXME: Find a way to clean this up $lint = dirname(__FILE__) . '/../../vendor/phptal/phptal/tools/phptal_lint.php'; $cmd = '/usr/bin/env php ' . $lint . ' %s %s "%s"'; @@ -210,7 +209,6 @@ class PhpTalLint implements PHPCI\Plugin $output = $this->phpci->getLastOutput(); - // FIXME: This is very messy, clean it up if (preg_match('/Found (.+?) (error|warning)/i', $output, $matches)) { $rows = explode(PHP_EOL, $output); diff --git a/PHPCI/Plugin/SlackNotify.php b/PHPCI/Plugin/SlackNotify.php index 1e1e3961..65a190fd 100644 --- a/PHPCI/Plugin/SlackNotify.php +++ b/PHPCI/Plugin/SlackNotify.php @@ -120,7 +120,7 @@ class SlackNotify implements \PHPCI\Plugin $success = true; - $message->send(''); // FIXME: Handle errors + $message->send(''); return $success; } From 12f8d376bd1037324bb7802f8140b9c37f90f4a4 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 12 Feb 2015 13:34:15 +0000 Subject: [PATCH 087/329] Adding a default robots.txt file. --- public/robots.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 public/robots.txt diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 00000000..25781b7d --- /dev/null +++ b/public/robots.txt @@ -0,0 +1,2 @@ +User-Agent: * +Disallow: From 6576974584cf9204302ccdff448637e43cf42bff Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 12 Feb 2015 13:42:07 +0000 Subject: [PATCH 088/329] Cleaning up permissions on a few files. --- PHPCI/Plugin/Mysql.php | 0 PHPCI/Plugin/PhpCodeSniffer.php | 0 PHPCI/Plugin/PhpDocblockChecker.php | 0 PHPCI/Plugin/PhpMessDetector.php | 0 PHPCI/build/.gitignore | 0 bootstrap.php | 0 public/assets/js/plugins/input-mask/phone-codes/readme.txt | 0 7 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 PHPCI/Plugin/Mysql.php mode change 100755 => 100644 PHPCI/Plugin/PhpCodeSniffer.php mode change 100755 => 100644 PHPCI/Plugin/PhpDocblockChecker.php mode change 100755 => 100644 PHPCI/Plugin/PhpMessDetector.php mode change 100755 => 100644 PHPCI/build/.gitignore mode change 100755 => 100644 bootstrap.php mode change 100755 => 100644 public/assets/js/plugins/input-mask/phone-codes/readme.txt diff --git a/PHPCI/Plugin/Mysql.php b/PHPCI/Plugin/Mysql.php old mode 100755 new mode 100644 diff --git a/PHPCI/Plugin/PhpCodeSniffer.php b/PHPCI/Plugin/PhpCodeSniffer.php old mode 100755 new mode 100644 diff --git a/PHPCI/Plugin/PhpDocblockChecker.php b/PHPCI/Plugin/PhpDocblockChecker.php old mode 100755 new mode 100644 diff --git a/PHPCI/Plugin/PhpMessDetector.php b/PHPCI/Plugin/PhpMessDetector.php old mode 100755 new mode 100644 diff --git a/PHPCI/build/.gitignore b/PHPCI/build/.gitignore old mode 100755 new mode 100644 diff --git a/bootstrap.php b/bootstrap.php old mode 100755 new mode 100644 diff --git a/public/assets/js/plugins/input-mask/phone-codes/readme.txt b/public/assets/js/plugins/input-mask/phone-codes/readme.txt old mode 100755 new mode 100644 From 5ca9d4606e995d432a9390f6aee4d0ca31a2fd69 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 12 Feb 2015 13:44:16 +0000 Subject: [PATCH 089/329] Fixes --- public/robots.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/robots.txt b/public/robots.txt index 25781b7d..0ad279c7 100644 --- a/public/robots.txt +++ b/public/robots.txt @@ -1,2 +1,2 @@ User-Agent: * -Disallow: +Disallow: From c20ca7c8ff546d8733dff9ff66053fe72150ba92 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 12 Feb 2015 14:11:58 +0000 Subject: [PATCH 090/329] Lots of cleanup. --- LICENSE.md | 2 +- PHPCI/Application.php | 3 +-- PHPCI/Command/CreateAdminCommand.php | 5 +---- PHPCI/Command/DaemonCommand.php | 5 ----- PHPCI/Command/DaemoniseCommand.php | 4 +--- PHPCI/Command/GenerateCommand.php | 2 -- PHPCI/Command/InstallCommand.php | 4 ++-- PHPCI/Command/PollCommand.php | 2 -- PHPCI/Command/RunCommand.php | 5 +---- PHPCI/Command/UpdateCommand.php | 3 --- PHPCI/Controller/PluginController.php | 1 - PHPCI/Controller/ProjectController.php | 7 ++----- PHPCI/Controller/SettingsController.php | 1 - PHPCI/Controller/UserController.php | 2 -- PHPCI/Controller/WebhookController.php | 1 - PHPCI/Helper/Email.php | 2 +- .../20140513153133_change_build_keys_migration.php | 2 +- PHPCI/Migrations/20140611170618_choose_branch.php | 2 +- PHPCI/Migrations/20150203105015_fix_column_types.php | 2 +- PHPCI/Plugin.php | 2 -- PHPCI/Plugin/Campfire.php | 1 - PHPCI/Plugin/CopyBuild.php | 2 +- PHPCI/Plugin/HipchatNotify.php | 8 +++----- PHPCI/Plugin/Util/ComposerPluginInformation.php | 4 +++- PHPCI/Plugin/Util/FilesPluginInformation.php | 6 +++--- PHPCI/Store/BuildStore.php | 1 - PHPCI/build/.gitignore | 2 +- daemon/.gitignore | 2 +- loggerconfig.php.example | 2 +- pluginconfig.php.example | 2 +- 30 files changed, 27 insertions(+), 60 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 1df52b9c..4c4f6952 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -6,4 +6,4 @@ Redistribution and use in source and binary forms, with or without modification, - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/PHPCI/Application.php b/PHPCI/Application.php index a8790804..ee1f6e15 100644 --- a/PHPCI/Application.php +++ b/PHPCI/Application.php @@ -14,7 +14,6 @@ use b8\Exception\HttpException; use b8\Http\Response; use b8\Http\Response\RedirectResponse; use b8\View; -use PHPCI\Model\Build; /** * PHPCI Front Controller @@ -58,7 +57,7 @@ class Application extends b8\Application $routeHandler = function (&$route, Response &$response) use (&$request, $validateSession, $skipAuth) { $skipValidation = in_array($route['controller'], array('session', 'webhook', 'build-status')); - if (!$skipValidation && !$validateSession() && !$skipAuth()) { + if (!$skipValidation && !$validateSession() && (!is_callable($skipAuth) || !$skipAuth())) { if ($request->isAjax()) { $response->setResponseCode(401); $response->setContent(''); diff --git a/PHPCI/Command/CreateAdminCommand.php b/PHPCI/Command/CreateAdminCommand.php index 81f23c72..3b69afd3 100644 --- a/PHPCI/Command/CreateAdminCommand.php +++ b/PHPCI/Command/CreateAdminCommand.php @@ -12,12 +12,9 @@ namespace PHPCI\Command; use PHPCI\Helper\Lang; use PHPCI\Service\UserService; use Symfony\Component\Console\Command\Command; -use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; -use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; use b8\Store\Factory; -use PHPCI\Builder; /** * Create admin command - creates an admin user @@ -77,7 +74,7 @@ class CreateAdminCommand extends Command if (!$emptyOk && empty($rtn)) { $rtn = $this->ask($question, $emptyOk, $validationFilter); - } elseif ($validationFilter != null && ! empty($rtn)) { + } elseif (!is_null($validationFilter) && ! empty($rtn)) { if (! $this -> controlFormat($rtn, $validationFilter, $statusMessage)) { print $statusMessage; $rtn = $this->ask($question, $emptyOk, $validationFilter); diff --git a/PHPCI/Command/DaemonCommand.php b/PHPCI/Command/DaemonCommand.php index 79925fbd..e51f31f1 100644 --- a/PHPCI/Command/DaemonCommand.php +++ b/PHPCI/Command/DaemonCommand.php @@ -12,13 +12,8 @@ namespace PHPCI\Command; use Monolog\Logger; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputArgument; -use Symfony\Component\Console\Input\InputDefinition; use Symfony\Component\Console\Input\InputInterface; -use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use b8\Store\Factory; -use PHPCI\Builder; -use PHPCI\BuildFactory; /** * Daemon that loops and call the run-command. diff --git a/PHPCI/Command/DaemoniseCommand.php b/PHPCI/Command/DaemoniseCommand.php index 0bcd42f6..eadd334e 100644 --- a/PHPCI/Command/DaemoniseCommand.php +++ b/PHPCI/Command/DaemoniseCommand.php @@ -12,9 +12,7 @@ namespace PHPCI\Command; use Monolog\Logger; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\ArgvInput; -use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; -use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; /** @@ -76,7 +74,7 @@ class DaemoniseCommand extends Command $this->sleep = 0; $runner = new RunCommand($this->logger); $runner->setMaxBuilds(1); - $runner->setIsDaemon(true); + $runner->setDaemon(true); $emptyInput = new ArgvInput(array()); diff --git a/PHPCI/Command/GenerateCommand.php b/PHPCI/Command/GenerateCommand.php index 07307686..ddd227d9 100644 --- a/PHPCI/Command/GenerateCommand.php +++ b/PHPCI/Command/GenerateCommand.php @@ -10,9 +10,7 @@ namespace PHPCI\Command; use Symfony\Component\Console\Command\Command; -use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; -use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; use b8\Database; use b8\Database\CodeGenerator; diff --git a/PHPCI/Command/InstallCommand.php b/PHPCI/Command/InstallCommand.php index 77b6b962..2917303d 100644 --- a/PHPCI/Command/InstallCommand.php +++ b/PHPCI/Command/InstallCommand.php @@ -17,11 +17,9 @@ use b8\Database; use b8\Store\Factory; use PHPCI\Helper\Lang; use Symfony\Component\Console\Command\Command; -use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Helper\DialogHelper; use PHPCI\Service\UserService; /** @@ -298,6 +296,8 @@ class InstallCommand extends Command ) ); + unset($pdo); + return true; } catch (Exception $ex) { diff --git a/PHPCI/Command/PollCommand.php b/PHPCI/Command/PollCommand.php index 42a07067..a8729515 100644 --- a/PHPCI/Command/PollCommand.php +++ b/PHPCI/Command/PollCommand.php @@ -14,9 +14,7 @@ use b8\HttpClient; use Monolog\Logger; use PHPCI\Helper\Lang; use Symfony\Component\Console\Command\Command; -use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; -use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Yaml\Parser; use PHPCI\Model\Build; diff --git a/PHPCI/Command/RunCommand.php b/PHPCI/Command/RunCommand.php index 63e38b2d..0cbd8e6a 100644 --- a/PHPCI/Command/RunCommand.php +++ b/PHPCI/Command/RunCommand.php @@ -15,11 +15,8 @@ use PHPCI\Helper\Lang; use PHPCI\Logging\BuildDBLogHandler; use PHPCI\Logging\LoggedBuildContextTidier; use PHPCI\Logging\OutputLogHandler; -use Psr\Log\LoggerAwareInterface; use Symfony\Component\Console\Command\Command; -use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; -use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; use b8\Store\Factory; use PHPCI\Builder; @@ -143,7 +140,7 @@ class RunCommand extends Command $this->maxBuilds = (int)$numBuilds; } - public function setIsDaemon($fromDaemon) + public function setDaemon($fromDaemon) { $this->isFromDaemon = (bool)$fromDaemon; } diff --git a/PHPCI/Command/UpdateCommand.php b/PHPCI/Command/UpdateCommand.php index 1ca1341d..8170675a 100644 --- a/PHPCI/Command/UpdateCommand.php +++ b/PHPCI/Command/UpdateCommand.php @@ -12,10 +12,7 @@ namespace PHPCI\Command; use Monolog\Logger; use PHPCI\Helper\Lang; use Symfony\Component\Console\Command\Command; -use Symfony\Component\Console\Input\InputArgument; -use Symfony\Component\Console\Input\InputDefinition; use Symfony\Component\Console\Input\InputInterface; -use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; /** diff --git a/PHPCI/Controller/PluginController.php b/PHPCI/Controller/PluginController.php index a090798e..20675e46 100644 --- a/PHPCI/Controller/PluginController.php +++ b/PHPCI/Controller/PluginController.php @@ -11,7 +11,6 @@ namespace PHPCI\Controller; use b8; use PHPCI\Helper\Lang; -use PHPCI\Model\Build; use PHPCI\Plugin\Util\ComposerPluginInformation; use PHPCI\Plugin\Util\FilesPluginInformation; use PHPCI\Plugin\Util\PluginInformationCollection; diff --git a/PHPCI/Controller/ProjectController.php b/PHPCI/Controller/ProjectController.php index e1aaa6cb..a626100b 100644 --- a/PHPCI/Controller/ProjectController.php +++ b/PHPCI/Controller/ProjectController.php @@ -10,17 +10,14 @@ namespace PHPCI\Controller; use b8; -use b8\Controller; use b8\Form; -use b8\Exception\HttpException\ForbiddenException; use b8\Exception\HttpException\NotFoundException; use b8\Store; +use PHPCI; use PHPCI\BuildFactory; use PHPCI\Helper\Github; use PHPCI\Helper\Lang; use PHPCI\Helper\SshKey; -use PHPCI\Model\Build; -use PHPCI\Model\Project; use PHPCI\Service\BuildService; use PHPCI\Service\ProjectService; @@ -30,7 +27,7 @@ use PHPCI\Service\ProjectService; * @package PHPCI * @subpackage Web */ -class ProjectController extends \PHPCI\Controller +class ProjectController extends Controller { /** * @var \PHPCI\Store\ProjectStore diff --git a/PHPCI/Controller/SettingsController.php b/PHPCI/Controller/SettingsController.php index ba9b0141..3c5ab5f4 100644 --- a/PHPCI/Controller/SettingsController.php +++ b/PHPCI/Controller/SettingsController.php @@ -14,7 +14,6 @@ use b8\Form; use b8\HttpClient; use PHPCI\Controller; use PHPCI\Helper\Lang; -use PHPCI\Model\Build; use Symfony\Component\Yaml\Dumper; use Symfony\Component\Yaml\Parser; diff --git a/PHPCI/Controller/UserController.php b/PHPCI/Controller/UserController.php index 48092ad5..8d09ecd0 100644 --- a/PHPCI/Controller/UserController.php +++ b/PHPCI/Controller/UserController.php @@ -10,12 +10,10 @@ namespace PHPCI\Controller; use b8; -use b8\Exception\HttpException\ForbiddenException; use b8\Exception\HttpException\NotFoundException; use b8\Form; use PHPCI\Controller; use PHPCI\Helper\Lang; -use PHPCI\Model\User; use PHPCI\Service\UserService; /** diff --git a/PHPCI/Controller/WebhookController.php b/PHPCI/Controller/WebhookController.php index 5ce4849b..cef7dc53 100644 --- a/PHPCI/Controller/WebhookController.php +++ b/PHPCI/Controller/WebhookController.php @@ -12,7 +12,6 @@ namespace PHPCI\Controller; use b8; use b8\Store; use PHPCI\BuildFactory; -use PHPCI\Model\Build; use PHPCI\Service\BuildService; /** diff --git a/PHPCI/Helper/Email.php b/PHPCI/Helper/Email.php index 3ca15e94..cb588dd1 100644 --- a/PHPCI/Helper/Email.php +++ b/PHPCI/Helper/Email.php @@ -90,7 +90,7 @@ class Email * @param bool $isHtml * @return $this */ - public function setIsHtml($isHtml = false) + public function setHtml($isHtml = false) { $this->isHtml = $isHtml; diff --git a/PHPCI/Migrations/20140513153133_change_build_keys_migration.php b/PHPCI/Migrations/20140513153133_change_build_keys_migration.php index b26a9388..7fd253cc 100644 --- a/PHPCI/Migrations/20140513153133_change_build_keys_migration.php +++ b/PHPCI/Migrations/20140513153133_change_build_keys_migration.php @@ -23,4 +23,4 @@ class ChangeBuildKeysMigration extends AbstractMigration $project->renameColumn('ssh_private_key', 'git_key'); $project->renameColumn('ssh_public_key', 'public_key'); } -} \ No newline at end of file +} diff --git a/PHPCI/Migrations/20140611170618_choose_branch.php b/PHPCI/Migrations/20140611170618_choose_branch.php index 5945c241..26b4ed4c 100644 --- a/PHPCI/Migrations/20140611170618_choose_branch.php +++ b/PHPCI/Migrations/20140611170618_choose_branch.php @@ -37,4 +37,4 @@ class ChooseBranch extends AbstractMigration $project = $this->table('project'); $project->removeColumn('branch')->save(); } -} \ No newline at end of file +} diff --git a/PHPCI/Migrations/20150203105015_fix_column_types.php b/PHPCI/Migrations/20150203105015_fix_column_types.php index 9a693594..f9bcf68a 100644 --- a/PHPCI/Migrations/20150203105015_fix_column_types.php +++ b/PHPCI/Migrations/20150203105015_fix_column_types.php @@ -25,4 +25,4 @@ class FixColumnTypes extends AbstractMigration 'limit' => MysqlAdapter::TEXT_MEDIUM, )); } -} \ No newline at end of file +} diff --git a/PHPCI/Plugin.php b/PHPCI/Plugin.php index 67914b7d..ac2960cd 100644 --- a/PHPCI/Plugin.php +++ b/PHPCI/Plugin.php @@ -9,8 +9,6 @@ namespace PHPCI; -use PHPCI\Model\Build; - /** * PHPCI Plugin Interface - Used by all build plugins. * @author Dan Cryer diff --git a/PHPCI/Plugin/Campfire.php b/PHPCI/Plugin/Campfire.php index b111786e..325e6e40 100644 --- a/PHPCI/Plugin/Campfire.php +++ b/PHPCI/Plugin/Campfire.php @@ -148,7 +148,6 @@ class Campfire implements \PHPCI\Plugin return json_decode($output); } // Simple 200 OK response (such as for joining a room) - // TODO: check for other result codes here return true; } } diff --git a/PHPCI/Plugin/CopyBuild.php b/PHPCI/Plugin/CopyBuild.php index a80819fb..7f447291 100644 --- a/PHPCI/Plugin/CopyBuild.php +++ b/PHPCI/Plugin/CopyBuild.php @@ -74,7 +74,7 @@ class CopyBuild implements \PHPCI\Plugin */ protected function wipeExistingDirectory() { - if ($this->wipe == true && $this->directory != '/' && is_dir($this->directory)) { + if ($this->wipe === true && $this->directory != '/' && is_dir($this->directory)) { $cmd = 'rm -Rf "%s*"'; $success = $this->phpci->executeCommand($cmd, $this->directory); diff --git a/PHPCI/Plugin/HipchatNotify.php b/PHPCI/Plugin/HipchatNotify.php index 0cc1bf70..a39b94fe 100644 --- a/PHPCI/Plugin/HipchatNotify.php +++ b/PHPCI/Plugin/HipchatNotify.php @@ -21,11 +21,9 @@ use PHPCI\Model\Build; */ class HipchatNotify implements \PHPCI\Plugin { - private $authToken; - private $userAgent; - private $cookie; - private $color; - private $notify; + protected $authToken; + protected $color; + protected $notify; /** * Set up the plugin, configure options, etc. diff --git a/PHPCI/Plugin/Util/ComposerPluginInformation.php b/PHPCI/Plugin/Util/ComposerPluginInformation.php index 1f022b4a..d8dcc91f 100644 --- a/PHPCI/Plugin/Util/ComposerPluginInformation.php +++ b/PHPCI/Plugin/Util/ComposerPluginInformation.php @@ -2,6 +2,8 @@ namespace PHPCI\Plugin\Util; +use PHPCI\Plugin; + /** * Class ComposerPluginInformation * @package PHPCI\Plugin\Util @@ -63,7 +65,7 @@ class ComposerPluginInformation implements InstalledPluginInformation public function getPluginClasses() { return array_map( - function ($plugin) { + function (Plugin $plugin) { return $plugin->class; }, $this->getInstalledPlugins() diff --git a/PHPCI/Plugin/Util/FilesPluginInformation.php b/PHPCI/Plugin/Util/FilesPluginInformation.php index 6bad028f..33b3e4b3 100644 --- a/PHPCI/Plugin/Util/FilesPluginInformation.php +++ b/PHPCI/Plugin/Util/FilesPluginInformation.php @@ -2,6 +2,8 @@ namespace PHPCI\Plugin\Util; +use PHPCI\Plugin; + /** * Class FilesPluginInformation * @package PHPCI\Plugin\Util @@ -66,7 +68,7 @@ class FilesPluginInformation implements InstalledPluginInformation public function getPluginClasses() { return array_map( - function ($plugin) { + function (Plugin $plugin) { return $plugin->class; }, $this->getInstalledPlugins() @@ -114,8 +116,6 @@ class FilesPluginInformation implements InstalledPluginInformation */ protected function getFullClassFromFile(\SplFileInfo $fileInfo) { - //TODO: Something less horrible than a regular expression - // on the contents of a file $contents = file_get_contents($fileInfo->getRealPath()); $matches = array(); diff --git a/PHPCI/Store/BuildStore.php b/PHPCI/Store/BuildStore.php index 96631e1e..3a4c0ddc 100644 --- a/PHPCI/Store/BuildStore.php +++ b/PHPCI/Store/BuildStore.php @@ -10,7 +10,6 @@ namespace PHPCI\Store; use b8\Database; -use PHPCI\BuildFactory; use PHPCI\Model\Build; use PHPCI\Store\Base\BuildStoreBase; diff --git a/PHPCI/build/.gitignore b/PHPCI/build/.gitignore index c96a04f0..d6b7ef32 100644 --- a/PHPCI/build/.gitignore +++ b/PHPCI/build/.gitignore @@ -1,2 +1,2 @@ * -!.gitignore \ No newline at end of file +!.gitignore diff --git a/daemon/.gitignore b/daemon/.gitignore index c96a04f0..d6b7ef32 100644 --- a/daemon/.gitignore +++ b/daemon/.gitignore @@ -1,2 +1,2 @@ * -!.gitignore \ No newline at end of file +!.gitignore diff --git a/loggerconfig.php.example b/loggerconfig.php.example index c306673b..d5abc96e 100644 --- a/loggerconfig.php.example +++ b/loggerconfig.php.example @@ -13,4 +13,4 @@ return array( new \Monolog\Handler\RotatingFileHandler(__DIR__ . DIRECTORY_SEPARATOR . 'everything',3, \Monolog\Logger::DEBUG), ); }, -); \ No newline at end of file +); diff --git a/pluginconfig.php.example b/pluginconfig.php.example index 4e4279b9..5c182401 100644 --- a/pluginconfig.php.example +++ b/pluginconfig.php.example @@ -19,4 +19,4 @@ return function (PHPCI\Plugin\Util\Factory $factory) { // The resource will only be given when the type hint is: PHPCI\Plugin\Util\Factory::TYPE_ARRAY ); -}; \ No newline at end of file +}; From 44c489dd222599501df2bc85601caccc6e86a423 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 12 Feb 2015 14:15:19 +0000 Subject: [PATCH 091/329] Lots of cleanup. --- PHPCI/Command/InstallCommand.php | 1 - PHPCI/Controller/ProjectController.php | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/PHPCI/Command/InstallCommand.php b/PHPCI/Command/InstallCommand.php index 2917303d..d262b9f0 100644 --- a/PHPCI/Command/InstallCommand.php +++ b/PHPCI/Command/InstallCommand.php @@ -13,7 +13,6 @@ use Exception; use PDO; use b8\Config; -use b8\Database; use b8\Store\Factory; use PHPCI\Helper\Lang; use Symfony\Component\Console\Command\Command; diff --git a/PHPCI/Controller/ProjectController.php b/PHPCI/Controller/ProjectController.php index a626100b..b263f06e 100644 --- a/PHPCI/Controller/ProjectController.php +++ b/PHPCI/Controller/ProjectController.php @@ -27,7 +27,7 @@ use PHPCI\Service\ProjectService; * @package PHPCI * @subpackage Web */ -class ProjectController extends Controller +class ProjectController extends PHPCI\Controller { /** * @var \PHPCI\Store\ProjectStore From 55b10948efc87039c9704962ef549c7771b0855a Mon Sep 17 00:00:00 2001 From: Igor Timoshenko Date: Wed, 4 Feb 2015 14:21:21 +0000 Subject: [PATCH 092/329] Added Codeception UI plugin --- PHPCI/Languages/lang.da.php | 2 + PHPCI/Languages/lang.de.php | 2 + PHPCI/Languages/lang.el.php | 2 + PHPCI/Languages/lang.en.php | 2 + PHPCI/Languages/lang.fr.php | 2 + PHPCI/Languages/lang.it.php | 4 +- PHPCI/Languages/lang.nl.php | 2 + PHPCI/Languages/lang.pl.php | 2 + PHPCI/Languages/lang.ru.php | 2 + PHPCI/Languages/lang.uk.php | 4 +- PHPCI/Plugin/Codeception.php | 90 +++++++++++++++---- public/assets/js/build-plugins/codeception.js | 75 ++++++++++++++++ public/assets/js/build-plugins/warnings.js | 3 +- 13 files changed, 170 insertions(+), 22 deletions(-) create mode 100644 public/assets/js/build-plugins/codeception.js diff --git a/PHPCI/Languages/lang.da.php b/PHPCI/Languages/lang.da.php index 12ed31e2..5010f28e 100644 --- a/PHPCI/Languages/lang.da.php +++ b/PHPCI/Languages/lang.da.php @@ -166,6 +166,7 @@ Services sektionen under dit Bitbucket-repository.', 'lines_of_code' => 'Kode-linjer', 'build_log' => 'Build-log', 'quality_trend' => 'Kvalitets-trend', + 'codeception_errors' => 'Codeception-fejl', 'phpmd_warnings' => 'PHPMD-advarsler', 'phpcs_warnings' => 'PHPCS-advarsler', 'phpcs_errors' => 'PHPCS-fejl', @@ -174,6 +175,7 @@ Services sektionen under dit Bitbucket-repository.', 'phpdoccheck_warnings' => 'Manglende Docblocks', 'issues' => 'Sager', + 'codeception' => 'Codeception', 'phpcpd' => 'PHP Copy/Paste Detector', 'phpcs' => 'PHP Code Sniffer', 'phpdoccheck' => 'Manglende Docblocks', diff --git a/PHPCI/Languages/lang.de.php b/PHPCI/Languages/lang.de.php index d89261c8..c40ef23d 100644 --- a/PHPCI/Languages/lang.de.php +++ b/PHPCI/Languages/lang.de.php @@ -164,6 +164,7 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab 'lines_of_code' => 'Anzahl Codezeilen', 'build_log' => 'Buildprotokoll', 'quality_trend' => 'Qualitätstrend', + 'codeception_errors' => 'Codeception Errors', 'phpmd_warnings' => 'PHPMD Warnings', 'phpcs_warnings' => 'PHPCS Warnings', 'phpcs_errors' => 'PHPCS Errors', @@ -172,6 +173,7 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab 'phpdoccheck_warnings' => 'Fehlende Docblocks', 'issues' => 'Probleme', + 'codeception' => 'Codeception', 'phpcpd' => 'PHP Copy/Paste Detector', 'phpcs' => 'PHP Code Sniffer', 'phpdoccheck' => 'Fehlende Docblocks', diff --git a/PHPCI/Languages/lang.el.php b/PHPCI/Languages/lang.el.php index 2089cd04..c611a87d 100644 --- a/PHPCI/Languages/lang.el.php +++ b/PHPCI/Languages/lang.el.php @@ -166,6 +166,7 @@ Services του Bitbucket αποθετηρίου σας.', 'lines_of_code' => 'Γραμμές Κώδικα', 'build_log' => 'Αρχείο καταγραφής κατασκευών', 'quality_trend' => 'Ποιότητα τρέντ', + 'codeception_errors' => 'Λάθη Codeception', 'phpmd_warnings' => 'Προειδοποιήσεις PHPMD', 'phpcs_warnings' => 'Προειδοποιήσεις PHPCS ', 'phpcs_errors' => 'Λάθη PHPCS', @@ -174,6 +175,7 @@ Services του Bitbucket αποθετηρίου σας.', 'phpdoccheck_warnings' => 'Χαμένα Docblocks', 'issues' => 'Θέματα', + 'codeception' => 'Codeception', 'phpcpd' => 'PHP Ανιχνευτής Αντιγραφής/Επικόλλησης', 'phpcs' => 'Sniffer Κώδικα PHP', 'phpdoccheck' => 'Χαμένα Docblocks', diff --git a/PHPCI/Languages/lang.en.php b/PHPCI/Languages/lang.en.php index 41526624..9718e442 100644 --- a/PHPCI/Languages/lang.en.php +++ b/PHPCI/Languages/lang.en.php @@ -167,6 +167,7 @@ PHPCI', 'lines_of_code' => 'Lines of Code', 'build_log' => 'Build Log', 'quality_trend' => 'Quality Trend', + 'codeception_errors' => 'Codeception Errors', 'phpmd_warnings' => 'PHPMD Warnings', 'phpcs_warnings' => 'PHPCS Warnings', 'phpcs_errors' => 'PHPCS Errors', @@ -175,6 +176,7 @@ PHPCI', 'phpdoccheck_warnings' => 'Missing Docblocks', 'issues' => 'Issues', + 'codeception' => 'Codeception', 'phpcpd' => 'PHP Copy/Paste Detector', 'phpcs' => 'PHP Code Sniffer', 'phpdoccheck' => 'Missing Docblocks', diff --git a/PHPCI/Languages/lang.fr.php b/PHPCI/Languages/lang.fr.php index 9e7cd339..45cc3958 100644 --- a/PHPCI/Languages/lang.fr.php +++ b/PHPCI/Languages/lang.fr.php @@ -167,6 +167,7 @@ PHPCI', 'lines_of_code' => 'Lignes de code', 'build_log' => 'Log du build', 'quality_trend' => 'Tendance de la qualité', + 'codeception_errors' => 'Erreurs Codeception', 'phpmd_warnings' => 'Alertes PHPMD', 'phpcs_warnings' => 'Alertes PHPCS', 'phpcs_errors' => 'Erreurs PHPCS', @@ -175,6 +176,7 @@ PHPCI', 'phpdoccheck_warnings' => 'Blocs de documentation manquants', 'issues' => 'Tickets', + 'codeception' => 'Codeception', 'phpcpd' => 'PHP Copy/Paste Detector', 'phpcs' => 'PHP Code Sniffer', 'phpdoccheck' => 'Missing Docblocks', diff --git a/PHPCI/Languages/lang.it.php b/PHPCI/Languages/lang.it.php index e4b531e0..c5c4e01b 100644 --- a/PHPCI/Languages/lang.it.php +++ b/PHPCI/Languages/lang.it.php @@ -11,7 +11,7 @@ $strings = array( 'language_name' => 'Italiano', 'language' => 'Lingua', - + // Log in: 'log_in_to_phpci' => 'Accedi a PHPCI', 'login_error' => 'Indirizzo email o password errati', @@ -169,6 +169,7 @@ PHPCI', 'lines_of_code' => 'Linee di codice', 'build_log' => 'Log della build', 'quality_trend' => 'Trend della qualità', + 'codeception_errors' => 'Errori di Codeception', 'phpmd_warnings' => 'Avvisi di PHPMD', 'phpcs_warnings' => 'Avvisi di PHPCS', 'phpcs_errors' => 'Errori di PHPCS', @@ -177,6 +178,7 @@ PHPCI', 'phpdoccheck_warnings' => 'Docblocks mancanti', 'issues' => 'Segnalazioni', + 'codeception' => 'Codeception', 'phpcpd' => 'PHP Copy/Paste Detector', 'phpcs' => 'PHP Code Sniffer', 'phpdoccheck' => 'Docblocks mancanti', diff --git a/PHPCI/Languages/lang.nl.php b/PHPCI/Languages/lang.nl.php index e03e709f..f38272c4 100644 --- a/PHPCI/Languages/lang.nl.php +++ b/PHPCI/Languages/lang.nl.php @@ -167,6 +167,7 @@ Services sectie van je Bitbucket repository toegevoegd worden.', 'lines_of_code' => 'Lijnen code', 'build_log' => 'Build Log', 'quality_trend' => 'Kwaliteitstrend', + 'codeception_errors' => 'Codeception Fouten', 'phpmd_warnings' => 'PHPMD Waarschuwingen', 'phpcs_warnings' => 'PHPCS Waarschuwingen', 'phpcs_errors' => 'PHPCS Fouten', @@ -175,6 +176,7 @@ Services sectie van je Bitbucket repository toegevoegd worden.', 'phpdoccheck_warnings' => 'Ontbrekende Docblocks', 'issues' => 'Problemen', + 'codeception' => 'Codeception', 'phpcpd' => 'PHP Copy/Paste Detector', 'phpcs' => 'PHP Code Sniffer', 'phpdoccheck' => 'Ontbrekende Docblocks', diff --git a/PHPCI/Languages/lang.pl.php b/PHPCI/Languages/lang.pl.php index a614d29d..4aafc9cf 100644 --- a/PHPCI/Languages/lang.pl.php +++ b/PHPCI/Languages/lang.pl.php @@ -167,6 +167,7 @@ Services repozytoria Bitbucket.', 'lines_of_code' => 'Linie Kodu', 'build_log' => 'Log Budowania', 'quality_trend' => 'Trend Jakości', + 'codeception_errors' => 'Błędy Codeception', 'phpmd_warnings' => 'Alerty PHPMD', 'phpcs_warnings' => 'Alerty PHPCS', 'phpcs_errors' => 'Błędy PHPCS', @@ -175,6 +176,7 @@ Services repozytoria Bitbucket.', 'phpdoccheck_warnings' => 'Brakuje sekcji DocBlock', 'issues' => 'Problemy', + 'codeception' => 'Codeception', 'phpcpd' => 'PHP Copy/Paste Detector', 'phpcs' => 'PHP Code Sniffer', 'phpdoccheck' => 'Brakuje sekcji DocBlock', diff --git a/PHPCI/Languages/lang.ru.php b/PHPCI/Languages/lang.ru.php index dfef84d9..00b2783e 100644 --- a/PHPCI/Languages/lang.ru.php +++ b/PHPCI/Languages/lang.ru.php @@ -162,6 +162,7 @@ PHPCI', 'lines_of_code' => 'Строк кода', 'build_log' => 'Лог сборки', 'quality_trend' => 'Тенденция качества', + 'codeception_errors' => 'Ошибки Codeception', 'phpmd_warnings' => 'Предупреждения PHPMD', 'phpcs_warnings' => 'Предупреждения PHPCS', 'phpcs_errors' => 'Ошибки PHPCS', @@ -170,6 +171,7 @@ PHPCI', 'phpdoccheck_warnings' => 'Пропущенные Docblocks', 'issues' => 'Проблемы', + 'codeception' => 'Codeception', 'phpcpd' => 'PHP Copy/Paste Detector', 'phpcs' => 'PHP Code Sniffer', 'phpdoccheck' => 'Missing Docblocks', diff --git a/PHPCI/Languages/lang.uk.php b/PHPCI/Languages/lang.uk.php index 24f9cbb2..f51bd885 100644 --- a/PHPCI/Languages/lang.uk.php +++ b/PHPCI/Languages/lang.uk.php @@ -167,14 +167,16 @@ PHPCI', 'lines_of_code' => 'Рядки коду', 'build_log' => 'Лог збірки', 'quality_trend' => 'Тенденція якості', + 'codeception_errors' => 'Помилки Codeception', 'phpmd_warnings' => 'Попередження PHPMD', 'phpcs_warnings' => 'Попередження PHPCS', 'phpcs_errors' => 'Помилки PHPCS', 'phplint_errors' => 'Помилки Lint', - 'phpunit_errors' => 'Помилки PHPCS', + 'phpunit_errors' => 'Помилки PHPUnit', 'phpdoccheck_warnings' => 'Відсутні Docblocks', 'issues' => 'Проблеми', + 'codeception' => 'Codeception', 'phpcpd' => 'PHP Copy/Paste Detector', 'phpcs' => 'PHP Code Sniffer', 'phpdoccheck' => 'Відсутні Docblocks', diff --git a/PHPCI/Plugin/Codeception.php b/PHPCI/Plugin/Codeception.php index 2f9e66fd..7d7fd81e 100644 --- a/PHPCI/Plugin/Codeception.php +++ b/PHPCI/Plugin/Codeception.php @@ -9,37 +9,50 @@ namespace PHPCI\Plugin; +use PHPCI; use PHPCI\Builder; use PHPCI\Helper\Lang; use PHPCI\Model\Build; +use PHPCI\Plugin\Util\TapParser; /** - * Codeception Plugin - Enables full acceptance, unit, and functional testing. + * Codeception Plugin - Enables full acceptance, unit, and functional testing + * * @author Don Gilbert + * @author Igor Timoshenko * @package PHPCI * @subpackage Plugins */ -class Codeception implements \PHPCI\Plugin +class Codeception implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin { /** * @var string */ protected $args = ''; + /** + * @var Build + */ + protected $build; + /** * @var Builder */ protected $phpci; - protected $build; + /** + * @var string|string[] The path (or array of paths) of an yml config for Codeception + */ + protected $configFile; /** - * @var string|string[] $xmlConfigFile The path (or array of paths) of an xml config for PHPUnit + * @var string The path where the reports and logs are stored */ - protected $xmlConfigFile; + protected $logPath = 'tests/_output'; /** * Set up the plugin, configure options, etc. + * * @param Builder $phpci * @param Build $build * @param array $options @@ -50,49 +63,86 @@ class Codeception implements \PHPCI\Plugin $this->build = $build; if (isset($options['config'])) { - $this->xmlConfigFile = $options['config']; + $this->configFile = $options['config']; } + if (isset($options['args'])) { $this->args = (string) $options['args']; } + + if (isset($options['log_path'])) { + $this->logPath = $options['log_path']; + } } /** - * Runs Codeception tests, optionally using specified config file(s). + * {@inheritDoc} */ public function execute() { $success = true; - // Run any config files first. This can be either a single value or an array. - if ($this->xmlConfigFile !== null) { - $success &= $this->runConfigFile($this->xmlConfigFile); + $this->phpci->logExecOutput(false); + + // Run any config files first. This can be either a single value or an array + if ($this->configFile !== null) { + $success &= $this->runConfigFile($this->configFile); } + $tapString = file_get_contents( + $this->phpci->buildPath . $this->logPath . DIRECTORY_SEPARATOR . 'report.tap.log' + ); + + try { + $tapParser = new TapParser($tapString); + $output = $tapParser->parse(); + } catch (\Exception $ex) { + $this->phpci->logFailure($tapString); + + throw $ex; + } + + $failures = $tapParser->getTotalFailures(); + + $this->build->storeMeta('codeception-errors', $failures); + $this->build->storeMeta('codeception-data', $output); + + $this->phpci->logExecOutput(true); + return $success; } /** - * Run tests from a Codeception config file. - * @param $configPath + * {@inheritDoc} + */ + public static function canExecute($stage, Builder $builder, Build $build) + { + return $stage === 'test'; + } + + /** + * Run tests from a Codeception config file + * + * @param string $configPath * @return bool|mixed */ protected function runConfigFile($configPath) { if (is_array($configPath)) { - return $this->recurseArg($configPath, array($this, "runConfigFile")); + return $this->recurseArg($configPath, array($this, 'runConfigFile')); } else { - $codecept = $this->phpci->findBinary('codecept'); if (!$codecept) { $this->phpci->logFailure(Lang::get('could_not_find', 'codecept')); + return false; } - $cmd = 'cd "%s" && ' . $codecept . ' run -c "%s" '. $this->args; + $cmd = 'cd "%s" && ' . $codecept . ' run -c "%s" --tap ' . $this->args; + if (IS_WIN) { - $cmd = 'cd /d "%s" && ' . $codecept . ' run -c "%s" '. $this->args; + $cmd = 'cd /d "%s" && ' . $codecept . ' run -c "%s" --tap ' . $this->args; } $configPath = $this->phpci->buildPath . $configPath; @@ -103,16 +153,18 @@ class Codeception implements \PHPCI\Plugin } /** - * @param $array - * @param $callable + * @param array $array + * @param \Callback $callable * @return bool|mixed */ - protected function recurseArg($array, $callable) + protected function recurseArg(array $array, $callable) { $success = true; + foreach ($array as $subItem) { $success &= call_user_func($callable, $subItem); } + return $success; } } diff --git a/public/assets/js/build-plugins/codeception.js b/public/assets/js/build-plugins/codeception.js new file mode 100644 index 00000000..def42330 --- /dev/null +++ b/public/assets/js/build-plugins/codeception.js @@ -0,0 +1,75 @@ +var codeceptionPlugin = ActiveBuild.UiPlugin.extend({ + id: 'build-codeception-errors', + css: 'col-lg-6 col-md-12 col-sm-12 col-xs-12', + title: Lang.get('codeception'), + lastData: null, + displayOnUpdate: false, + box: true, + rendered: false, + + register: function() { + var self = this; + var query = ActiveBuild.registerQuery('codeception-data', -1, {key: 'codeception-data'}) + + $(window).on('codeception-data', function(data) { + self.onUpdate(data); + }); + + $(window).on('build-updated', function() { + if (!self.rendered) { + self.displayOnUpdate = true; + query(); + } + }); + }, + + render: function() { + + return $('' + + '' + + '' + + ' ' + + '' + + '
    '+Lang.get('test')+'
    '); + }, + + onUpdate: function(e) { + if (!e.queryData) { + $('#build-codeception-errors').hide(); + return; + } + + this.rendered = true; + this.lastData = e.queryData; + + var tests = this.lastData[0].meta_value; + var tbody = $('#codeception-data tbody'); + tbody.empty(); + + if (tests.length == 0) { + $('#build-codeception-errors').hide(); + return; + } + + for (var i in tests) { + + var row = $('' + + ''+tests[i].suite+'' + + '::'+tests[i].test+'
    ' + + ''+(tests[i].message || '')+'' + + ''); + + if (!tests[i].pass) { + row.addClass('danger'); + } else { + row.addClass('success'); + } + + tbody.append(row); + } + + $('#build-codeception-errors').show(); + } +}); + +ActiveBuild.registerPlugin(new codeceptionPlugin()); diff --git a/public/assets/js/build-plugins/warnings.js b/public/assets/js/build-plugins/warnings.js index a2a31dc3..7e8ae0b1 100644 --- a/public/assets/js/build-plugins/warnings.js +++ b/public/assets/js/build-plugins/warnings.js @@ -3,6 +3,7 @@ var warningsPlugin = ActiveBuild.UiPlugin.extend({ css: 'col-lg-6 col-md-6 col-sm-12 col-xs-12', title: Lang.get('quality_trend'), keys: { + 'codeception-errors': Lang.get('codeception_errors'), 'phpmd-warnings': Lang.get('phpmd_warnings'), 'phpcs-warnings': Lang.get('phpcs_warnings'), 'phpcs-errors': Lang.get('phpcs_errors'), @@ -24,7 +25,7 @@ var warningsPlugin = ActiveBuild.UiPlugin.extend({ queries.push(ActiveBuild.registerQuery(key, -1, {num_builds: 10, key: key})); } - $(window).on('phpmd-warnings phpcs-warnings phptallint-warnings phptallint-errors phpcs-errors phplint-errors phpunit-errors phpdoccheck-warnings', function(data) { + $(window).on('codeception-errors phpmd-warnings phpcs-warnings phptallint-warnings phptallint-errors phpcs-errors phplint-errors phpunit-errors phpdoccheck-warnings', function(data) { self.onUpdate(data); }); From 691f2423f78e6122be0e651d0c87066999ad06fc Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 16 Feb 2015 11:20:18 +0000 Subject: [PATCH 093/329] Fixing base store docblocks. --- PHPCI/Store/Base/BuildMetaStoreBase.php | 29 +++++++++++++++++++++++++ PHPCI/Store/Base/BuildStoreBase.php | 29 +++++++++++++++++++++++++ PHPCI/Store/Base/ProjectStoreBase.php | 21 ++++++++++++++++++ PHPCI/Store/Base/UserStoreBase.php | 20 +++++++++++++++++ 4 files changed, 99 insertions(+) diff --git a/PHPCI/Store/Base/BuildMetaStoreBase.php b/PHPCI/Store/Base/BuildMetaStoreBase.php index 6c4cfc15..7a3d4159 100644 --- a/PHPCI/Store/Base/BuildMetaStoreBase.php +++ b/PHPCI/Store/Base/BuildMetaStoreBase.php @@ -20,11 +20,24 @@ class BuildMetaStoreBase extends Store protected $modelName = '\PHPCI\Model\BuildMeta'; protected $primaryKey = 'id'; + /** + * Returns a BuildMeta model by primary key. + * @param mixed $value + * @param string $useConnection + * @return \@appNamespace\Model\BuildMeta|null + */ public function getByPrimaryKey($value, $useConnection = 'read') { return $this->getById($value, $useConnection); } + /** + * Returns a BuildMeta model by Id. + * @param mixed $value + * @param string $useConnection + * @throws HttpException + * @return \@appNamespace\Model\BuildMeta|null + */ public function getById($value, $useConnection = 'read') { if (is_null($value)) { @@ -44,6 +57,14 @@ class BuildMetaStoreBase extends Store return null; } + /** + * Returns an array of BuildMeta models by ProjectId. + * @param mixed $value + * @param int $limit + * @param string $useConnection + * @throws HttpException + * @return array + */ public function getByProjectId($value, $limit = 1000, $useConnection = 'read') { if (is_null($value)) { @@ -72,6 +93,14 @@ class BuildMetaStoreBase extends Store } } + /** + * Returns an array of BuildMeta models by BuildId. + * @param mixed $value + * @param int $limit + * @param string $useConnection + * @throws HttpException + * @return array + */ public function getByBuildId($value, $limit = 1000, $useConnection = 'read') { if (is_null($value)) { diff --git a/PHPCI/Store/Base/BuildStoreBase.php b/PHPCI/Store/Base/BuildStoreBase.php index 89d3a82f..0560d72b 100644 --- a/PHPCI/Store/Base/BuildStoreBase.php +++ b/PHPCI/Store/Base/BuildStoreBase.php @@ -20,11 +20,24 @@ class BuildStoreBase extends Store protected $modelName = '\PHPCI\Model\Build'; protected $primaryKey = 'id'; + /** + * Returns a Build model by primary key. + * @param mixed $value + * @param string $useConnection + * @return \@appNamespace\Model\Build|null + */ public function getByPrimaryKey($value, $useConnection = 'read') { return $this->getById($value, $useConnection); } + /** + * Returns a Build model by Id. + * @param mixed $value + * @param string $useConnection + * @throws HttpException + * @return \@appNamespace\Model\Build|null + */ public function getById($value, $useConnection = 'read') { if (is_null($value)) { @@ -44,6 +57,14 @@ class BuildStoreBase extends Store return null; } + /** + * Returns an array of Build models by ProjectId. + * @param mixed $value + * @param int $limit + * @param string $useConnection + * @throws HttpException + * @return array + */ public function getByProjectId($value, $limit = 1000, $useConnection = 'read') { if (is_null($value)) { @@ -72,6 +93,14 @@ class BuildStoreBase extends Store } } + /** + * Returns an array of Build models by Status. + * @param mixed $value + * @param int $limit + * @param string $useConnection + * @throws HttpException + * @return array + */ public function getByStatus($value, $limit = 1000, $useConnection = 'read') { if (is_null($value)) { diff --git a/PHPCI/Store/Base/ProjectStoreBase.php b/PHPCI/Store/Base/ProjectStoreBase.php index e5a01cdd..562afba2 100644 --- a/PHPCI/Store/Base/ProjectStoreBase.php +++ b/PHPCI/Store/Base/ProjectStoreBase.php @@ -20,11 +20,24 @@ class ProjectStoreBase extends Store protected $modelName = '\PHPCI\Model\Project'; protected $primaryKey = 'id'; + /** + * Returns a Project model by primary key. + * @param mixed $value + * @param string $useConnection + * @return \@appNamespace\Model\Project|null + */ public function getByPrimaryKey($value, $useConnection = 'read') { return $this->getById($value, $useConnection); } + /** + * Returns a Project model by Id. + * @param mixed $value + * @param string $useConnection + * @throws HttpException + * @return \@appNamespace\Model\Project|null + */ public function getById($value, $useConnection = 'read') { if (is_null($value)) { @@ -44,6 +57,14 @@ class ProjectStoreBase extends Store return null; } + /** + * Returns an array of Project models by Title. + * @param mixed $value + * @param int $limit + * @param string $useConnection + * @throws HttpException + * @return array + */ public function getByTitle($value, $limit = 1000, $useConnection = 'read') { if (is_null($value)) { diff --git a/PHPCI/Store/Base/UserStoreBase.php b/PHPCI/Store/Base/UserStoreBase.php index fd903d8e..d91271d0 100644 --- a/PHPCI/Store/Base/UserStoreBase.php +++ b/PHPCI/Store/Base/UserStoreBase.php @@ -20,11 +20,24 @@ class UserStoreBase extends Store protected $modelName = '\PHPCI\Model\User'; protected $primaryKey = 'id'; + /** + * Returns a User model by primary key. + * @param mixed $value + * @param string $useConnection + * @return \@appNamespace\Model\User|null + */ public function getByPrimaryKey($value, $useConnection = 'read') { return $this->getById($value, $useConnection); } + /** + * Returns a User model by Id. + * @param mixed $value + * @param string $useConnection + * @throws HttpException + * @return \@appNamespace\Model\User|null + */ public function getById($value, $useConnection = 'read') { if (is_null($value)) { @@ -44,6 +57,13 @@ class UserStoreBase extends Store return null; } + /** + * Returns a User model by Email. + * @param mixed $value + * @param string $useConnection + * @throws HttpException + * @return \@appNamespace\Model\User|null + */ public function getByEmail($value, $useConnection = 'read') { if (is_null($value)) { From 0fc18503b22fb8077447a37c23ed34552eeb1705 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 16 Feb 2015 11:54:52 +0000 Subject: [PATCH 094/329] Fixing install command tests. --- Tests/PHPCI/Command/InstallCommandTest.php | 209 ++++++++++++--------- 1 file changed, 120 insertions(+), 89 deletions(-) diff --git a/Tests/PHPCI/Command/InstallCommandTest.php b/Tests/PHPCI/Command/InstallCommandTest.php index 29c22303..4dd0f133 100644 --- a/Tests/PHPCI/Command/InstallCommandTest.php +++ b/Tests/PHPCI/Command/InstallCommandTest.php @@ -3,7 +3,6 @@ namespace PHPCI\Plugin\Tests\Command; use Symfony\Component\Console\Application; -use PHPCI\Command\InstallCommand; use Prophecy\PhpUnit\ProphecyTestCase; use Symfony\Component\Console\Tester\CommandTester; use Symfony\Component\Console\Helper\HelperSet; @@ -12,17 +11,43 @@ class InstallCommandTest extends ProphecyTestCase { protected $config; protected $admin; - protected $command; - protected $dialog; protected $application; public function setup() { parent::setup(); + $this->application = new Application(); + $this->application->setHelperSet(new HelperSet()); + } + + /** + * @return \PHPUnit_Framework_MockObject_MockBuilder + */ + protected function getDialogHelperMock() + { + // We check that there's no interaction with user. + $dialog = $this->getMockBuilder('Symfony\\Component\\Console\\Helper\\DialogHelper') + ->setMethods(array( + 'ask', + 'askConfirmation', + 'askAndValidate', + 'askHiddenResponse', + 'askHiddenResponseAndValidate', + )) + ->getMock(); + + return $dialog; + } + + /** + * @return \PHPUnit_Framework_MockObject_MockBuilder + */ + protected function getInstallCommandMock() + { // Current command, we need to mock all method that interact with // Database & File system. - $this->command = $this->getMockBuilder('PHPCI\\Command\\InstallCommand') + $command = $this->getMockBuilder('PHPCI\\Command\\InstallCommand') ->setMethods(array( 'reloadConfig', 'verifyNotInstalled', @@ -33,38 +58,27 @@ class InstallCommandTest extends ProphecyTestCase )) ->getMock(); - $this->command->expects($this->once())->method('verifyDatabaseDetails')->willReturn(true); - $this->command->expects($this->once())->method('setupDatabase')->willReturn(true); - $this->command->expects($this->once())->method('createAdminUser')->will( + $command->expects($this->once())->method('verifyNotInstalled')->willReturn(true); + $command->expects($this->once())->method('verifyDatabaseDetails')->willReturn(true); + $command->expects($this->once())->method('setupDatabase')->willReturn(true); + $command->expects($this->once())->method('createAdminUser')->will( $this->returnCallback(function ($adm) {// use (&$admin) { $this->admin = $adm; }) ); - $this->command->expects($this->once())->method('writeConfigFile')->will( + $command->expects($this->once())->method('writeConfigFile')->will( $this->returnCallback(function ($cfg) { //use (&$config) { $this->config = $cfg; }) ); - // We check that there's no interaction with user. - $this->dialog = $this->getMockBuilder('Symfony\\Component\\Console\\Helper\\DialogHelper') - ->setMethods(array( - 'ask', - 'askConfirmation', - 'askAndValidate', - 'askHiddenResponse', - 'askHiddenResponseAndValidate', - )) - ->getMock(); - - $this->application = new Application(); - $this->application->setHelperSet(new HelperSet()); + return $command; } - protected function getCommandTester() + protected function getCommandTester($dialog) { - $this->application->getHelperSet()->set($this->dialog, 'dialog'); - $this->application->add($this->command); + $this->application->getHelperSet()->set($dialog, 'dialog'); + $this->application->add($this->getInstallCommandMock()); $command = $this->application->find('phpci:install'); $commandTester = new CommandTester($command); @@ -91,39 +105,42 @@ class InstallCommandTest extends ProphecyTestCase return $config; } - protected function executeWithoutParam($param = null) + protected function executeWithoutParam($param = null, $dialog) { // Clean result variables. $this->admin = array(); $this->config = array(); // Get tester and execute with extracted parameters. - $commandTester = $this->getCommandTester(); + $commandTester = $this->getCommandTester($dialog); $parameters = $this->getConfig($param); $commandTester->execute($parameters); } - public function testAutomticInstallation() + public function testAutomaticInstallation() { - $this->dialog->expects($this->never())->method('ask'); - $this->dialog->expects($this->never())->method('askConfirmation'); - $this->dialog->expects($this->never())->method('askAndValidate'); - $this->dialog->expects($this->never())->method('askHiddenResponse'); - $this->dialog->expects($this->never())->method('askHiddenResponseAndValidate'); + $dialog = $this->getDialogHelperMock(); + $dialog->expects($this->never())->method('ask'); + $dialog->expects($this->never())->method('askConfirmation'); + $dialog->expects($this->never())->method('askAndValidate'); + $dialog->expects($this->never())->method('askHiddenResponse'); + $dialog->expects($this->never())->method('askHiddenResponseAndValidate'); - $this->executeWithoutParam(); + $this->executeWithoutParam(null, $dialog); } public function testDatabaseHostnameConfig() { - // We specified an input value for hostname. - $this->dialog->expects($this->once())->method('ask')->willReturn('testedvalue'); - $this->dialog->expects($this->never())->method('askConfirmation'); - $this->dialog->expects($this->never())->method('askAndValidate'); - $this->dialog->expects($this->never())->method('askHiddenResponse'); - $this->dialog->expects($this->never())->method('askHiddenResponseAndValidate'); + $dialog = $this->getDialogHelperMock(); - $this->executeWithoutParam('--db-host'); + // We specified an input value for hostname. + $dialog->expects($this->once())->method('ask')->willReturn('testedvalue'); + $dialog->expects($this->never())->method('askConfirmation'); + $dialog->expects($this->never())->method('askAndValidate'); + $dialog->expects($this->never())->method('askHiddenResponse'); + $dialog->expects($this->never())->method('askHiddenResponseAndValidate'); + + $this->executeWithoutParam('--db-host', $dialog); // Check that specified arguments are correctly loaded. $this->assertEquals('testedvalue', $this->config['b8']['database']['servers']['read']); @@ -132,14 +149,16 @@ class InstallCommandTest extends ProphecyTestCase public function testDatabaseNameConfig() { - // We specified an input value for hostname. - $this->dialog->expects($this->once())->method('ask')->willReturn('testedvalue'); - $this->dialog->expects($this->never())->method('askConfirmation'); - $this->dialog->expects($this->never())->method('askAndValidate'); - $this->dialog->expects($this->never())->method('askHiddenResponse'); - $this->dialog->expects($this->never())->method('askHiddenResponseAndValidate'); + $dialog = $this->getDialogHelperMock(); - $this->executeWithoutParam('--db-name'); + // We specified an input value for hostname. + $dialog->expects($this->once())->method('ask')->willReturn('testedvalue'); + $dialog->expects($this->never())->method('askConfirmation'); + $dialog->expects($this->never())->method('askAndValidate'); + $dialog->expects($this->never())->method('askHiddenResponse'); + $dialog->expects($this->never())->method('askHiddenResponseAndValidate'); + + $this->executeWithoutParam('--db-name', $dialog); // Check that specified arguments are correctly loaded. $this->assertEquals('testedvalue', $this->config['b8']['database']['name']); @@ -147,14 +166,16 @@ class InstallCommandTest extends ProphecyTestCase public function testDatabaseUserameConfig() { - // We specified an input value for hostname. - $this->dialog->expects($this->once())->method('ask')->willReturn('testedvalue'); - $this->dialog->expects($this->never())->method('askConfirmation'); - $this->dialog->expects($this->never())->method('askAndValidate'); - $this->dialog->expects($this->never())->method('askHiddenResponse'); - $this->dialog->expects($this->never())->method('askHiddenResponseAndValidate'); + $dialog = $this->getDialogHelperMock(); - $this->executeWithoutParam('--db-user'); + // We specified an input value for hostname. + $dialog->expects($this->once())->method('ask')->willReturn('testedvalue'); + $dialog->expects($this->never())->method('askConfirmation'); + $dialog->expects($this->never())->method('askAndValidate'); + $dialog->expects($this->never())->method('askHiddenResponse'); + $dialog->expects($this->never())->method('askHiddenResponseAndValidate'); + + $this->executeWithoutParam('--db-user', $dialog); // Check that specified arguments are correctly loaded. $this->assertEquals('testedvalue', $this->config['b8']['database']['username']); @@ -162,14 +183,16 @@ class InstallCommandTest extends ProphecyTestCase public function testDatabasePasswordConfig() { - // We specified an input value for hostname. - $this->dialog->expects($this->never())->method('ask'); - $this->dialog->expects($this->never())->method('askConfirmation'); - $this->dialog->expects($this->never())->method('askAndValidate'); - $this->dialog->expects($this->once())->method('askHiddenResponse')->willReturn('testedvalue'); - $this->dialog->expects($this->never())->method('askHiddenResponseAndValidate'); + $dialog = $this->getDialogHelperMock(); - $this->executeWithoutParam('--db-pass'); + // We specified an input value for hostname. + $dialog->expects($this->never())->method('ask'); + $dialog->expects($this->never())->method('askConfirmation'); + $dialog->expects($this->never())->method('askAndValidate'); + $dialog->expects($this->once())->method('askHiddenResponse')->willReturn('testedvalue'); + $dialog->expects($this->never())->method('askHiddenResponseAndValidate'); + + $this->executeWithoutParam('--db-pass', $dialog); // Check that specified arguments are correctly loaded. $this->assertEquals('testedvalue', $this->config['b8']['database']['password']); @@ -177,14 +200,16 @@ class InstallCommandTest extends ProphecyTestCase public function testPhpciUrlConfig() { - // We specified an input value for hostname. - $this->dialog->expects($this->never())->method('ask'); - $this->dialog->expects($this->never())->method('askConfirmation'); - $this->dialog->expects($this->once())->method('askAndValidate')->willReturn('http://testedvalue.com'); - $this->dialog->expects($this->never())->method('askHiddenResponse'); - $this->dialog->expects($this->never())->method('askHiddenResponseAndValidate'); + $dialog = $this->getDialogHelperMock(); - $this->executeWithoutParam('--url'); + // We specified an input value for hostname. + $dialog->expects($this->never())->method('ask'); + $dialog->expects($this->never())->method('askConfirmation'); + $dialog->expects($this->once())->method('askAndValidate')->willReturn('http://testedvalue.com'); + $dialog->expects($this->never())->method('askHiddenResponse'); + $dialog->expects($this->never())->method('askHiddenResponseAndValidate'); + + $this->executeWithoutParam('--url', $dialog); // Check that specified arguments are correctly loaded. $this->assertEquals('http://testedvalue.com', $this->config['phpci']['url']); @@ -192,14 +217,16 @@ class InstallCommandTest extends ProphecyTestCase public function testAdminEmailConfig() { - // We specified an input value for hostname. - $this->dialog->expects($this->never())->method('ask'); - $this->dialog->expects($this->never())->method('askConfirmation'); - $this->dialog->expects($this->once())->method('askAndValidate')->willReturn('test@phpci.com'); - $this->dialog->expects($this->never())->method('askHiddenResponse'); - $this->dialog->expects($this->never())->method('askHiddenResponseAndValidate'); + $dialog = $this->getDialogHelperMock(); - $this->executeWithoutParam('--admin-mail'); + // We specified an input value for hostname. + $dialog->expects($this->never())->method('ask'); + $dialog->expects($this->never())->method('askConfirmation'); + $dialog->expects($this->once())->method('askAndValidate')->willReturn('test@phpci.com'); + $dialog->expects($this->never())->method('askHiddenResponse'); + $dialog->expects($this->never())->method('askHiddenResponseAndValidate'); + + $this->executeWithoutParam('--admin-mail', $dialog); // Check that specified arguments are correctly loaded. $this->assertEquals('test@phpci.com', $this->admin['mail']); @@ -207,14 +234,16 @@ class InstallCommandTest extends ProphecyTestCase public function testAdminUserameConfig() { - // Define expectation for dialog. - $this->dialog->expects($this->once())->method('ask')->willReturn('testedvalue'); - $this->dialog->expects($this->never())->method('askConfirmation'); - $this->dialog->expects($this->never())->method('askAndValidate'); - $this->dialog->expects($this->never())->method('askHiddenResponse'); - $this->dialog->expects($this->never())->method('askHiddenResponseAndValidate'); + $dialog = $this->getDialogHelperMock(); - $this->executeWithoutParam('--admin-name'); + // Define expectation for dialog. + $dialog->expects($this->once())->method('ask')->willReturn('testedvalue'); + $dialog->expects($this->never())->method('askConfirmation'); + $dialog->expects($this->never())->method('askAndValidate'); + $dialog->expects($this->never())->method('askHiddenResponse'); + $dialog->expects($this->never())->method('askHiddenResponseAndValidate'); + + $this->executeWithoutParam('--admin-name', $dialog); // Check that specified arguments are correctly loaded. $this->assertEquals('testedvalue', $this->admin['name']); @@ -222,14 +251,16 @@ class InstallCommandTest extends ProphecyTestCase public function testAdminPasswordConfig() { - // We specified an input value for hostname. - $this->dialog->expects($this->never())->method('ask'); - $this->dialog->expects($this->never())->method('askConfirmation'); - $this->dialog->expects($this->never())->method('askAndValidate'); - $this->dialog->expects($this->once())->method('askHiddenResponse')->willReturn('testedvalue'); - $this->dialog->expects($this->never())->method('askHiddenResponseAndValidate'); + $dialog = $this->getDialogHelperMock(); - $this->executeWithoutParam('--admin-pass'); + // We specified an input value for hostname. + $dialog->expects($this->never())->method('ask'); + $dialog->expects($this->never())->method('askConfirmation'); + $dialog->expects($this->never())->method('askAndValidate'); + $dialog->expects($this->once())->method('askHiddenResponse')->willReturn('testedvalue'); + $dialog->expects($this->never())->method('askHiddenResponseAndValidate'); + + $this->executeWithoutParam('--admin-pass', $dialog); // Check that specified arguments are correctly loaded. $this->assertEquals('testedvalue', $this->admin['pass']); From 4d142b61b6956c61be13bc67e8aace76c48e1001 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 16 Feb 2015 11:58:15 +0000 Subject: [PATCH 095/329] Fixing other tests --- PHPCI/Plugin/Util/FilesPluginInformation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Plugin/Util/FilesPluginInformation.php b/PHPCI/Plugin/Util/FilesPluginInformation.php index 33b3e4b3..2593ae22 100644 --- a/PHPCI/Plugin/Util/FilesPluginInformation.php +++ b/PHPCI/Plugin/Util/FilesPluginInformation.php @@ -68,7 +68,7 @@ class FilesPluginInformation implements InstalledPluginInformation public function getPluginClasses() { return array_map( - function (Plugin $plugin) { + function (\stdClass $plugin) { return $plugin->class; }, $this->getInstalledPlugins() From f192185e263de56bb99fec299eb5e4f644de2649 Mon Sep 17 00:00:00 2001 From: Marco Vito Moscaritolo Date: Tue, 11 Nov 2014 22:58:23 +0100 Subject: [PATCH 096/329] Refactor on mail sending to use Email helper and specific tempalte for successfull build. --- PHPCI/Plugin/Email.php | 111 ++++++++++++++------------------- PHPCI/View/Email/success.phtml | 15 +++++ 2 files changed, 61 insertions(+), 65 deletions(-) create mode 100644 PHPCI/View/Email/success.phtml diff --git a/PHPCI/Plugin/Email.php b/PHPCI/Plugin/Email.php index 7c5171d6..85720d7f 100644 --- a/PHPCI/Plugin/Email.php +++ b/PHPCI/Plugin/Email.php @@ -13,6 +13,7 @@ use b8\View; use PHPCI\Builder; use PHPCI\Helper\Lang; use PHPCI\Model\Build; +use PHPCI\Helper\Email as EmailHelper; /** * Email Plugin - Provides simple email capability to PHPCI. @@ -27,21 +28,16 @@ class Email implements \PHPCI\Plugin */ protected $phpci; + /** + * @var \PHPCI\Model\Build + */ + protected $build; + /** * @var array */ protected $options; - /** - * @var \Swift_Mailer - */ - protected $mailer; - - /** - * @var string - */ - protected $fromAddress; - /** * Set up the plugin, configure options, etc. * @param Builder $phpci @@ -52,25 +48,16 @@ class Email implements \PHPCI\Plugin public function __construct( Builder $phpci, Build $build, - \Swift_Mailer $mailer, array $options = array() ) { $this->phpci = $phpci; $this->build = $build; $this->options = $options; - - $phpCiSettings = $phpci->getSystemConfig('phpci'); - - $this->fromAddress = isset($phpCiSettings['email_settings']['from_address']) - ? $phpCiSettings['email_settings']['from_address'] - : "notifications-ci@phptesting.org"; - - $this->mailer = $mailer; } /** - * Connects to MySQL and runs a specified set of queries. - */ + * Send a notificaiton mail. + */ public function execute() { $addresses = $this->getEmailAddresses(); @@ -81,79 +68,73 @@ class Email implements \PHPCI\Plugin return false; } - $subjectTemplate = "PHPCI - %s - %s"; + $buildStatus = $this->build->isSuccessful() ? "Failing Build" : "Passing Build"; $projectName = $this->phpci->getBuildProjectTitle(); - $logText = $this->build->getLog(); + $mailTemplate = $this->build->isSuccessful() ? 'Email/success' : 'Email/failed'; - if ($this->build->isSuccessful()) { - $sendFailures = $this->sendSeparateEmails( - $addresses, - sprintf($subjectTemplate, $projectName, Lang::get('passing_build')), - sprintf(Lang::get('log_output')."
    %s
    ", $logText) - ); - } else { - $view = new View('Email/failed'); - $view->build = $this->build; - $view->project = $this->build->getProject(); + $view = new View($mailTemplate); + $view->build = $this->build; + $view->project = $this->build->getProject(); + $body = $view->render(); - $emailHtml = $view->render(); - - $sendFailures = $this->sendSeparateEmails( - $addresses, - sprintf($subjectTemplate, $projectName, Lang::get('failing_build')), - $emailHtml - ); - } + $sendFailures = $this->sendSeparateEmails( + $addresses, + sprintf("PHPCI - %s - %s", $projectName, $buildStatus), + $body + ); // This is a success if we've not failed to send anything. + $this->phpci->log(sprintf("%d emails sent", (count($addresses) - $sendFailures))); + $this->phpci->log(sprintf("%d emails failed to send", $sendFailures)); - $this->phpci->log(Lang::get('n_emails_sent', (count($addresses) - count($sendFailures)))); - $this->phpci->log(Lang::get('n_emails_failed', count($sendFailures))); - - return (count($sendFailures) == 0); + return ($sendFailures === 0); } /** - * @param string[]|string $toAddresses Array or single address to send to + * @param string $toAddress Single address to send to * @param string[] $ccList * @param string $subject Email subject * @param string $body Email body * @return array Array of failed addresses */ - public function sendEmail($toAddresses, $ccList, $subject, $body) + public function sendEmail($toAddress, $ccList, $subject, $body) { - $message = \Swift_Message::newInstance($subject) - ->setFrom($this->fromAddress) - ->setTo($toAddresses) - ->setBody($body) - ->setContentType("text/html"); + $email = new EmailHelper(); + + $email->setEmailTo($toAddress, $toAddress); + $email->setSubject($subject); + $email->setBody($body); + $email->setIsHtml(true); if (is_array($ccList) && count($ccList)) { - $message->setCc($ccList); + foreach ($ccList as $address) { + $message->addCc($address, $address); + } } - $failedAddresses = array(); - $this->mailer->send($message, $failedAddresses); - - return $failedAddresses; + return $email->send(); } /** - * Send out build status emails. + * Send an email to a list of specified subjects. + * * @param array $toAddresses - * @param $subject - * @param $body - * @return array + * List of destinatary of message. + * @param string $subject + * Mail subject + * @param string $body + * Mail body + * + * @return int number of failed messages */ public function sendSeparateEmails(array $toAddresses, $subject, $body) { - $failures = array(); + $failures = 0; $ccList = $this->getCcAddresses(); foreach ($toAddresses as $address) { - $newFailures = $this->sendEmail($address, $ccList, $subject, $body); - foreach ($newFailures as $failure) { - $failures[] = $failure; + if (!$this->sendEmail($address, $ccList, $subject, $body)) { + $failures++; } } return $failures; diff --git a/PHPCI/View/Email/success.phtml b/PHPCI/View/Email/success.phtml new file mode 100644 index 00000000..a6dfccea --- /dev/null +++ b/PHPCI/View/Email/success.phtml @@ -0,0 +1,15 @@ +
    +
    +
    + getTitle(); ?> - Build #getId(); ?> +
    + +
    +

    Your commit getCommitId(); ?> genrate a successfull build in project getTitle(); ?>.

    + +

    getCommitMessage(); ?>

    + 
    getLog(); ?>
    +

    You can review your commit and the build log.

    +
    +
    +
    From 501ca58729e63adcd6f408f1f912f551f5e185af Mon Sep 17 00:00:00 2001 From: Marco Vito Moscaritolo Date: Tue, 11 Nov 2014 22:58:57 +0100 Subject: [PATCH 097/329] Remove unrequire parameters on constructur and fixed error on phpdoc. --- Tests/PHPCI/Plugin/EmailTest.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Tests/PHPCI/Plugin/EmailTest.php b/Tests/PHPCI/Plugin/EmailTest.php index 0fa2d8f0..b53f4a96 100644 --- a/Tests/PHPCI/Plugin/EmailTest.php +++ b/Tests/PHPCI/Plugin/EmailTest.php @@ -30,12 +30,7 @@ class EmailTest extends \PHPUnit_Framework_TestCase protected $mockCiBuilder; /** - * @var \PHPUnit_Framework_MockObject_MockObject $mockMailer - */ - protected $mockMailer; - - /** - * @var \PHPUnit_Framework_MockObject_MockObject $mockMailer + * @var \PHPUnit_Framework_MockObject_MockObject $mockBuild */ protected $mockBuild; @@ -111,7 +106,6 @@ class EmailTest extends \PHPUnit_Framework_TestCase $this->testedEmailPlugin = new EmailPlugin( $this->mockCiBuilder, $this->mockBuild, - $this->mockMailer, $arrOptions ); } @@ -322,4 +316,4 @@ class EmailTest extends \PHPUnit_Framework_TestCase $actualMail->getSubject() ); } -} \ No newline at end of file +} From 33ca150efba7915956ea183950476355ec7e920a Mon Sep 17 00:00:00 2001 From: Marco Vito Moscaritolo Date: Tue, 11 Nov 2014 23:05:35 +0100 Subject: [PATCH 098/329] Added project mocking to allow using mail template on successfull build. --- Tests/PHPCI/Plugin/EmailTest.php | 68 ++++++++++---------------------- 1 file changed, 20 insertions(+), 48 deletions(-) diff --git a/Tests/PHPCI/Plugin/EmailTest.php b/Tests/PHPCI/Plugin/EmailTest.php index b53f4a96..855736f2 100644 --- a/Tests/PHPCI/Plugin/EmailTest.php +++ b/Tests/PHPCI/Plugin/EmailTest.php @@ -34,11 +34,28 @@ class EmailTest extends \PHPUnit_Framework_TestCase */ protected $mockBuild; + /** + * @var \PHPUnit_Framework_MockObject_MockObject $mockProject + */ + protected $mockProject; + public function setUp() { + $this->mockProject = $this->getMock( + '\PHPCI\Model\Project', + array('getTitle'), + array(), + "mockProject", + false + ); + + $this->mockProject->expects($this->any()) + ->method('getTitle') + ->will($this->returnValue("Test project")); + $this->mockBuild = $this->getMock( '\PHPCI\Model\Build', - array('getLog', 'getStatus'), + array('getLog', 'getStatus', 'getProject'), array(), "mockBuild", false @@ -53,8 +70,8 @@ class EmailTest extends \PHPUnit_Framework_TestCase ->will($this->returnValue(\PHPCI\Model\Build::STATUS_SUCCESS)); $this->mockBuild->expects($this->any()) - ->method('getCommitterEmail') - ->will($this->returnValue("committer@test.com")); + ->method('getProject') + ->will($this->returnValue($this->mockProject)); $this->mockCiBuilder = $this->getMock( '\PHPCI\Builder', @@ -149,53 +166,8 @@ class EmailTest extends \PHPUnit_Framework_TestCase ); $this->assertEquals($expectedReturn, $returnValue); - } - /** - * @covers PHPUnit::execute - */ - public function testExecute_UniqueRecipientsFromWithCommitter() - { - $this->loadEmailPluginWithOptions( - array( - 'addresses' => array('test-receiver@example.com', 'test-receiver2@example.com') - ) - ); - $actualMails = []; - $this->catchMailPassedToSend($actualMails); - - $returnValue = $this->testedEmailPlugin->execute(); - $this->assertTrue($returnValue); - - $this->assertCount(2, $actualMails); - - $actualTos = array(key($actualMails[0]->getTo()), key($actualMails[1]->getTo())); - $this->assertContains('test-receiver@example.com', $actualTos); - $this->assertContains('test-receiver2@example.com', $actualTos); - } - - /** - * @covers PHPUnit::execute - */ - public function testExecute_UniqueRecipientsWithCommiter() - { - $this->loadEmailPluginWithOptions( - array( - 'commiter' => true, - 'addresses' => array('test-receiver@example.com', 'committer@test.com') - ) - ); - - $actualMails = []; - $this->catchMailPassedToSend($actualMails); - - $returnValue = $this->testedEmailPlugin->execute(); - $this->assertTrue($returnValue); - - $actualTos = array(key($actualMails[0]->getTo()), key($actualMails[1]->getTo())); - $this->assertContains('test-receiver@example.com', $actualTos); - $this->assertContains('committer@test.com', $actualTos); } /** From f16395e45b12c5f9c015f060fdf86f0579c75606 Mon Sep 17 00:00:00 2001 From: Marco Vito Moscaritolo Date: Wed, 12 Nov 2014 00:20:17 +0100 Subject: [PATCH 099/329] Use more consistent project name loader to compose mail. --- PHPCI/Plugin/Email.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PHPCI/Plugin/Email.php b/PHPCI/Plugin/Email.php index 85720d7f..406caed6 100644 --- a/PHPCI/Plugin/Email.php +++ b/PHPCI/Plugin/Email.php @@ -68,8 +68,8 @@ class Email implements \PHPCI\Plugin return false; } - $buildStatus = $this->build->isSuccessful() ? "Failing Build" : "Passing Build"; - $projectName = $this->phpci->getBuildProjectTitle(); + $buildStatus = $this->build->isSuccessful() ? "Passing Build" : "Failing Build"; + $projectName = $this->build->getProject()->getTitle(); $mailTemplate = $this->build->isSuccessful() ? 'Email/success' : 'Email/failed'; $view = new View($mailTemplate); From 64bd64e07bb55f28ae4bf63efa400a4a3eea97ff Mon Sep 17 00:00:00 2001 From: Marco Vito Moscaritolo Date: Wed, 12 Nov 2014 00:20:55 +0100 Subject: [PATCH 100/329] Added more test case to validate subject, body, status code and mails on messages. --- Tests/PHPCI/Plugin/EmailTest.php | 364 +++++++++++++++++++------------ 1 file changed, 220 insertions(+), 144 deletions(-) diff --git a/Tests/PHPCI/Plugin/EmailTest.php b/Tests/PHPCI/Plugin/EmailTest.php index 855736f2..e311d508 100644 --- a/Tests/PHPCI/Plugin/EmailTest.php +++ b/Tests/PHPCI/Plugin/EmailTest.php @@ -10,6 +10,7 @@ namespace PHPCI\Plugin\Tests; use PHPCI\Plugin\Email as EmailPlugin; +use PHPCI\Model\Build; /** @@ -39,8 +40,26 @@ class EmailTest extends \PHPUnit_Framework_TestCase */ protected $mockProject; + /** + * @var int buildStatus + */ + protected $buildStatus; + + /** + * @var array $message; + */ + protected $message; + + /** + * @var bool $mailDelivered + */ + protected $mailDelivered; + public function setUp() { + $this->message = array(); + $this->mailDelivered = true; + $this->mockProject = $this->getMock( '\PHPCI\Model\Project', array('getTitle'), @@ -51,11 +70,11 @@ class EmailTest extends \PHPUnit_Framework_TestCase $this->mockProject->expects($this->any()) ->method('getTitle') - ->will($this->returnValue("Test project")); + ->will($this->returnValue("Test-Project")); $this->mockBuild = $this->getMock( '\PHPCI\Model\Build', - array('getLog', 'getStatus', 'getProject'), + array('getLog', 'getStatus', 'getProject', 'getCommitterEmail'), array(), "mockBuild", false @@ -67,17 +86,22 @@ class EmailTest extends \PHPUnit_Framework_TestCase $this->mockBuild->expects($this->any()) ->method('getStatus') - ->will($this->returnValue(\PHPCI\Model\Build::STATUS_SUCCESS)); + ->will($this->returnCallback(function () { + return $this->buildStatus; + })); $this->mockBuild->expects($this->any()) ->method('getProject') ->will($this->returnValue($this->mockProject)); + $this->mockBuild->expects($this->any()) + ->method('getCommitterEmail') + ->will($this->returnValue('committer-email@example.com')); + $this->mockCiBuilder = $this->getMock( '\PHPCI\Builder', array( 'getSystemConfig', - 'getBuildProjectTitle', 'getBuild', 'log' ), @@ -100,30 +124,41 @@ class EmailTest extends \PHPUnit_Framework_TestCase ) ) ); - $this->mockCiBuilder->expects($this->any()) - ->method('getBuildProjectTitle') - ->will($this->returnValue('Test-Project')); - $this->mockCiBuilder->expects($this->any()) - ->method('getBuild') - ->will($this->returnValue($this->mockBuild)); - - $this->mockMailer = $this->getMock( - '\Swift_Mailer', - array('send'), - array(), - "mockMailer", - false - ); - - $this->loadEmailPluginWithOptions(); } - protected function loadEmailPluginWithOptions($arrOptions = array()) + protected function loadEmailPluginWithOptions($arrOptions = array(), $buildStatus = null, $mailDelivered = true) { - $this->testedEmailPlugin = new EmailPlugin( - $this->mockCiBuilder, - $this->mockBuild, - $arrOptions + $this->mailDelivered = $mailDelivered; + + if (is_null($buildStatus)) { + $this->buildStatus = Build::STATUS_SUCCESS; + } else { + $this->buildStatus = $buildStatus; + } + + // Reset current message. + $this->message = array(); + + $this->testedEmailPlugin = $this->getMock( + '\PHPCI\Plugin\Email', + array('sendEmail'), + array( + $this->mockCiBuilder, + $this->mockBuild, + $arrOptions + ) + ); + + $this->testedEmailPlugin->expects($this->any()) + ->method('sendEmail') + ->will($this->returnCallback(function ($to, $cc, $subject, $body) { + $this->message['to'][] = $to; + $this->message['cc'] = $cc; + $this->message['subject'] = $subject; + $this->message['body'] = $body; + + return $this->mailDelivered; + }) ); } @@ -132,7 +167,10 @@ class EmailTest extends \PHPUnit_Framework_TestCase */ public function testExecute_ReturnsFalseWithoutArgs() { + $this->loadEmailPluginWithOptions(); + $returnValue = $this->testedEmailPlugin->execute(); + // As no addresses will have been mailed as non are configured. $expectedReturn = false; @@ -147,145 +185,183 @@ class EmailTest extends \PHPUnit_Framework_TestCase $this->loadEmailPluginWithOptions( array( 'addresses' => array('test-receiver@example.com') - ) + ), + Build::STATUS_SUCCESS ); - /** @var \Swift_Message $actualMail */ - $actualMail = null; - $this->catchMailPassedToSend($actualMail); - $returnValue = $this->testedEmailPlugin->execute(); - $expectedReturn = true; - $this->assertSystemMail( - 'test-receiver@example.com', - 'test-from-address@example.com', - "Log Output: 
    Build Log
    ", - "PHPCI - Test-Project - Passing Build", - $actualMail + $this->assertContains('test-receiver@example.com', $this->message['to']); + } + + /** + * @covers PHPUnit::execute + */ + public function testExecute_BuildsDefaultEmails() + { + $this->loadEmailPluginWithOptions( + array( + 'default_mailto_address' => 'default-mailto-address@example.com' + ), + Build::STATUS_SUCCESS ); - $this->assertEquals($expectedReturn, $returnValue); - + $returnValue = $this->testedEmailPlugin->execute(); + $this->assertContains('default-mailto-address@example.com', $this->message['to']); } /** - * @covers PHPUnit::sendEmail + * @covers PHPUnit::execute */ - public function testSendEmail_CallsMailerSend() + public function testExecute_CcDefaultEmails() { - $this->mockMailer->expects($this->once()) - ->method('send'); - $this->testedEmailPlugin->sendEmail("test@email.com", array(), "hello", "body"); - } - - /** - * @covers PHPUnit::sendEmail - */ - public function testSendEmail_BuildsAMessageObject() - { - $subject = "Test mail"; - $body = "Message Body"; - $toAddress = "test@example.com"; - - $this->mockMailer->expects($this->once()) - ->method('send') - ->with($this->isInstanceOf('\Swift_Message'), $this->anything()); - $this->testedEmailPlugin->sendEmail($toAddress, array(), $subject, $body); - } - - /** - * @covers PHPUnit::sendEmail - */ - public function testSendEmail_BuildsExpectedMessage() - { - $subject = "Test mail"; - $body = "Message Body"; - $toAddress = "test@example.com"; - $expectedMessage = \Swift_Message::newInstance($subject) - ->setFrom('test-from-address@example.com') - ->setTo($toAddress) - ->setBody($body); - - /** @var \Swift_Message $actualMail */ - $actualMail = null; - $this->catchMailPassedToSend($actualMail); - - $this->testedEmailPlugin->sendEmail($toAddress, array(), $subject, $body); - - $this->assertSystemMail( - $toAddress, - 'test-from-address@example.com', - $body, - $subject, - $actualMail + $this->loadEmailPluginWithOptions( + array( + 'default_mailto_address' => 'default-mailto-address@example.com', + 'cc' => array( + 'cc-email-1@example.com', + 'cc-email-2@example.com', + 'cc-email-3@example.com', + ), + ), + Build::STATUS_SUCCESS ); - } - /** - * @param \Swift_Message $actualMail passed by ref and populated with - * the message object the mock mailer - * receives. - */ - protected function catchMailPassedToSend(&$actualMail) - { - $this->mockMailer->expects(is_array($actualMail) ? $this->atLeast(1) : $this->once()) - ->method('send') - ->will( - $this->returnCallback( - function ($passedMail) use (&$actualMail) { - if(is_array($actualMail)) { - $actualMail[] = $passedMail; - } else { - $actualMail = $passedMail; - } - return array(); - } - ) - ); - } - - /** - * Asserts that the actual mail object is populated as expected. - * - * @param string $expectedToAddress - * @param $expectedFromAddress - * @param string $expectedBody - * @param string $expectedSubject - * @param \Swift_Message $actualMail - */ - protected function assertSystemMail( - $expectedToAddress, - $expectedFromAddress, - $expectedBody, - $expectedSubject, - $actualMail - ) { - if (!($actualMail instanceof \Swift_Message)) { - $type = is_object($actualMail) ? get_class($actualMail) : gettype( - $actualMail - ); - throw new \Exception("Expected Swift_Message got " . $type); - } - $this->assertEquals( - array($expectedFromAddress => null), - $actualMail->getFrom() - ); + $this->testedEmailPlugin->execute(); $this->assertEquals( - array($expectedToAddress => null), - $actualMail->getTo() + array( + 'cc-email-1@example.com', + 'cc-email-2@example.com', + 'cc-email-3@example.com', + ), + $this->message['cc'] + ); + } + + /** + * @covers PHPUnit::execute + */ + public function testExecute_BuildsCommitterEmails() + { + $this->loadEmailPluginWithOptions( + array( + 'committer' => true + ), + Build::STATUS_SUCCESS ); - $this->assertEquals( - $expectedBody, - $actualMail->getBody() + $this->testedEmailPlugin->execute(); + + $this->assertContains('committer-email@example.com', $this->message['to']); + } + + /** + * @covers PHPUnit::execute + */ + public function testExecute_MailSuccessfulBuildHaveProjectName() + { + $this->loadEmailPluginWithOptions( + array( + 'addresses' => array('test-receiver@example.com') + ), + Build::STATUS_SUCCESS ); - $this->assertEquals( - $expectedSubject, - $actualMail->getSubject() + $returnValue = $this->testedEmailPlugin->execute(); + + $this->assertContains('Test-Project', $this->message['subject']); + $this->assertContains('Test-Project', $this->message['body']); + } + + /** + * @covers PHPUnit::execute + */ + public function testExecute_MailFailingBuildHaveProjectName() + { + $this->loadEmailPluginWithOptions( + array( + 'addresses' => array('test-receiver@example.com') + ), + Build::STATUS_FAILED ); + + $returnValue = $this->testedEmailPlugin->execute(); + + $this->assertContains('Test-Project', $this->message['subject']); + $this->assertContains('Test-Project', $this->message['body']); + } + + /** + * @covers PHPUnit::execute + */ + public function testExecute_MailSuccessfulBuildHaveStatus() + { + $this->loadEmailPluginWithOptions( + array( + 'addresses' => array('test-receiver@example.com') + ), + Build::STATUS_SUCCESS + ); + + $returnValue = $this->testedEmailPlugin->execute(); + + $this->assertContains('Passing', $this->message['subject']); + $this->assertContains('successfull', $this->message['body']); + } + + /** + * @covers PHPUnit::execute + */ + public function testExecute_MailFailingBuildHaveStatus() + { + $this->loadEmailPluginWithOptions( + array( + 'addresses' => array('test-receiver@example.com') + ), + Build::STATUS_FAILED + ); + + $returnValue = $this->testedEmailPlugin->execute(); + + $this->assertContains('Failing', $this->message['subject']); + $this->assertContains('failed', $this->message['body']); + } + + /** + * @covers PHPUnit::execute + */ + public function testExecute_MailDeliverySuccess() + { + $this->loadEmailPluginWithOptions( + array( + 'addresses' => array('test-receiver@example.com') + ), + Build::STATUS_FAILED, + true + ); + + $returnValue = $this->testedEmailPlugin->execute(); + + $this->assertEquals(true, $returnValue); + } + + /** + * @covers PHPUnit::execute + */ + public function testExecute_MailDeliveryFail() + { + $this->loadEmailPluginWithOptions( + array( + 'addresses' => array('test-receiver@example.com') + ), + Build::STATUS_FAILED, + false + ); + + $returnValue = $this->testedEmailPlugin->execute(); + + $this->assertEquals(false, $returnValue); } } From 2aff5ab89670bb14fe0a42e2cee99c6fb6894c87 Mon Sep 17 00:00:00 2001 From: Marco Vito Moscaritolo Date: Wed, 12 Nov 2014 13:37:52 +0100 Subject: [PATCH 101/329] Fixed CS. --- Tests/PHPCI/Plugin/EmailTest.php | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/Tests/PHPCI/Plugin/EmailTest.php b/Tests/PHPCI/Plugin/EmailTest.php index e311d508..791123e4 100644 --- a/Tests/PHPCI/Plugin/EmailTest.php +++ b/Tests/PHPCI/Plugin/EmailTest.php @@ -12,7 +12,6 @@ namespace PHPCI\Plugin\Tests; use PHPCI\Plugin\Email as EmailPlugin; use PHPCI\Model\Build; - /** * Unit test for the PHPUnit plugin. * @author meadsteve @@ -158,14 +157,13 @@ class EmailTest extends \PHPUnit_Framework_TestCase $this->message['body'] = $body; return $this->mailDelivered; - }) - ); + })); } /** * @covers PHPUnit::execute */ - public function testExecute_ReturnsFalseWithoutArgs() + public function testReturnsFalseWithoutArgs() { $this->loadEmailPluginWithOptions(); @@ -180,7 +178,7 @@ class EmailTest extends \PHPUnit_Framework_TestCase /** * @covers PHPUnit::execute */ - public function testExecute_BuildsBasicEmails() + public function testBuildsBasicEmails() { $this->loadEmailPluginWithOptions( array( @@ -197,7 +195,7 @@ class EmailTest extends \PHPUnit_Framework_TestCase /** * @covers PHPUnit::execute */ - public function testExecute_BuildsDefaultEmails() + public function testBuildsDefaultEmails() { $this->loadEmailPluginWithOptions( array( @@ -214,7 +212,7 @@ class EmailTest extends \PHPUnit_Framework_TestCase /** * @covers PHPUnit::execute */ - public function testExecute_CcDefaultEmails() + public function testCcDefaultEmails() { $this->loadEmailPluginWithOptions( array( @@ -243,7 +241,7 @@ class EmailTest extends \PHPUnit_Framework_TestCase /** * @covers PHPUnit::execute */ - public function testExecute_BuildsCommitterEmails() + public function testBuildsCommitterEmails() { $this->loadEmailPluginWithOptions( array( @@ -260,7 +258,7 @@ class EmailTest extends \PHPUnit_Framework_TestCase /** * @covers PHPUnit::execute */ - public function testExecute_MailSuccessfulBuildHaveProjectName() + public function testMailSuccessfulBuildHaveProjectName() { $this->loadEmailPluginWithOptions( array( @@ -278,7 +276,7 @@ class EmailTest extends \PHPUnit_Framework_TestCase /** * @covers PHPUnit::execute */ - public function testExecute_MailFailingBuildHaveProjectName() + public function testMailFailingBuildHaveProjectName() { $this->loadEmailPluginWithOptions( array( @@ -296,7 +294,7 @@ class EmailTest extends \PHPUnit_Framework_TestCase /** * @covers PHPUnit::execute */ - public function testExecute_MailSuccessfulBuildHaveStatus() + public function testMailSuccessfulBuildHaveStatus() { $this->loadEmailPluginWithOptions( array( @@ -314,7 +312,7 @@ class EmailTest extends \PHPUnit_Framework_TestCase /** * @covers PHPUnit::execute */ - public function testExecute_MailFailingBuildHaveStatus() + public function testMailFailingBuildHaveStatus() { $this->loadEmailPluginWithOptions( array( @@ -332,7 +330,7 @@ class EmailTest extends \PHPUnit_Framework_TestCase /** * @covers PHPUnit::execute */ - public function testExecute_MailDeliverySuccess() + public function testMailDeliverySuccess() { $this->loadEmailPluginWithOptions( array( @@ -350,7 +348,7 @@ class EmailTest extends \PHPUnit_Framework_TestCase /** * @covers PHPUnit::execute */ - public function testExecute_MailDeliveryFail() + public function testMailDeliveryFail() { $this->loadEmailPluginWithOptions( array( From 2d194de6d0267e3312407506723fdf033f31a2d2 Mon Sep 17 00:00:00 2001 From: Marco Vito Moscaritolo Date: Wed, 12 Nov 2014 13:44:56 +0100 Subject: [PATCH 102/329] Fixed code in CC mails. --- PHPCI/Plugin/Email.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Plugin/Email.php b/PHPCI/Plugin/Email.php index 406caed6..fa2a4e85 100644 --- a/PHPCI/Plugin/Email.php +++ b/PHPCI/Plugin/Email.php @@ -108,7 +108,7 @@ class Email implements \PHPCI\Plugin if (is_array($ccList) && count($ccList)) { foreach ($ccList as $address) { - $message->addCc($address, $address); + $email->addCc($address, $address); } } From 74b0513dd5fd88e297dc8d5ea2c687b69c9a4c87 Mon Sep 17 00:00:00 2001 From: Marco Vito Moscaritolo Date: Wed, 12 Nov 2014 13:51:01 +0100 Subject: [PATCH 103/329] Remove unused code. --- Tests/PHPCI/Plugin/EmailTest.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Tests/PHPCI/Plugin/EmailTest.php b/Tests/PHPCI/Plugin/EmailTest.php index 791123e4..183d17e5 100644 --- a/Tests/PHPCI/Plugin/EmailTest.php +++ b/Tests/PHPCI/Plugin/EmailTest.php @@ -187,7 +187,7 @@ class EmailTest extends \PHPUnit_Framework_TestCase Build::STATUS_SUCCESS ); - $returnValue = $this->testedEmailPlugin->execute(); + $this->testedEmailPlugin->execute(); $this->assertContains('test-receiver@example.com', $this->message['to']); } @@ -204,7 +204,7 @@ class EmailTest extends \PHPUnit_Framework_TestCase Build::STATUS_SUCCESS ); - $returnValue = $this->testedEmailPlugin->execute(); + $this->testedEmailPlugin->execute(); $this->assertContains('default-mailto-address@example.com', $this->message['to']); } @@ -267,7 +267,7 @@ class EmailTest extends \PHPUnit_Framework_TestCase Build::STATUS_SUCCESS ); - $returnValue = $this->testedEmailPlugin->execute(); + $this->testedEmailPlugin->execute(); $this->assertContains('Test-Project', $this->message['subject']); $this->assertContains('Test-Project', $this->message['body']); @@ -285,7 +285,7 @@ class EmailTest extends \PHPUnit_Framework_TestCase Build::STATUS_FAILED ); - $returnValue = $this->testedEmailPlugin->execute(); + $this->testedEmailPlugin->execute(); $this->assertContains('Test-Project', $this->message['subject']); $this->assertContains('Test-Project', $this->message['body']); @@ -303,7 +303,7 @@ class EmailTest extends \PHPUnit_Framework_TestCase Build::STATUS_SUCCESS ); - $returnValue = $this->testedEmailPlugin->execute(); + $this->testedEmailPlugin->execute(); $this->assertContains('Passing', $this->message['subject']); $this->assertContains('successfull', $this->message['body']); @@ -321,7 +321,7 @@ class EmailTest extends \PHPUnit_Framework_TestCase Build::STATUS_FAILED ); - $returnValue = $this->testedEmailPlugin->execute(); + $this->testedEmailPlugin->execute(); $this->assertContains('Failing', $this->message['subject']); $this->assertContains('failed', $this->message['body']); From 5b754fe07c757bfeefbfb348b71961f7e56ba20e Mon Sep 17 00:00:00 2001 From: Marco Vito Moscaritolo Date: Thu, 25 Dec 2014 21:49:53 +0100 Subject: [PATCH 104/329] Fixed config path for tests. --- Tests/bootstrap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php index a8b71034..f7cbd630 100644 --- a/Tests/bootstrap.php +++ b/Tests/bootstrap.php @@ -17,7 +17,7 @@ require_once(dirname(__DIR__) . '/vendor/autoload.php'); $conf = array(); $conf['b8']['app']['namespace'] = 'PHPCI'; $conf['b8']['app']['default_controller'] = 'Home'; -$conf['b8']['view']['path'] = dirname(__DIR__) . '/PHPCI/View/'; +$conf['b8']['view']['path'] = dirname(__DIR__) . '/../PHPCI/View/'; // If the PHPCI config file is not where we expect it, try looking in // env for an alternative config path. From 885f947da804b4324b436eb8cf123d54b720e490 Mon Sep 17 00:00:00 2001 From: Marco Vito Moscaritolo Date: Thu, 25 Dec 2014 22:20:11 +0100 Subject: [PATCH 105/329] Update loader config for test. --- Tests/bootstrap.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php index f7cbd630..601c7d7b 100644 --- a/Tests/bootstrap.php +++ b/Tests/bootstrap.php @@ -13,12 +13,6 @@ date_default_timezone_set(@date_default_timezone_get()); // Load Composer autoloader: require_once(dirname(__DIR__) . '/vendor/autoload.php'); -// Load configuration if present: -$conf = array(); -$conf['b8']['app']['namespace'] = 'PHPCI'; -$conf['b8']['app']['default_controller'] = 'Home'; -$conf['b8']['view']['path'] = dirname(__DIR__) . '/../PHPCI/View/'; - // If the PHPCI config file is not where we expect it, try looking in // env for an alternative config path. $configFile = dirname(__FILE__) . '/../PHPCI/config.yml'; @@ -31,6 +25,12 @@ if (!file_exists($configFile)) { } } +// Load configuration if present: +$conf = array(); +$conf['b8']['app']['namespace'] = 'PHPCI'; +$conf['b8']['app']['default_controller'] = 'Home'; +$conf['b8']['view']['path'] = dirname(__DIR__) . '/PHPCI/View/'; + $config = new b8\Config($conf); if (file_exists($configFile)) { From cbd98b6b46a637b48712d2d1f92973b2b013c3b8 Mon Sep 17 00:00:00 2001 From: Marco Vito Moscaritolo Date: Thu, 5 Feb 2015 14:27:26 +0100 Subject: [PATCH 106/329] Fixed typo. --- PHPCI/Plugin/Email.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Plugin/Email.php b/PHPCI/Plugin/Email.php index fa2a4e85..02987e9b 100644 --- a/PHPCI/Plugin/Email.php +++ b/PHPCI/Plugin/Email.php @@ -56,7 +56,7 @@ class Email implements \PHPCI\Plugin } /** - * Send a notificaiton mail. + * Send a notification mail. */ public function execute() { From 2255767dc1e14b9d5fc3f7f2862a66e721dd95b3 Mon Sep 17 00:00:00 2001 From: Marco Vito Moscaritolo Date: Fri, 6 Feb 2015 19:09:37 +0100 Subject: [PATCH 107/329] Fixed test that use genreated mail to see information. --- Tests/PHPCI/Plugin/EmailTest.php | 39 ++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/Tests/PHPCI/Plugin/EmailTest.php b/Tests/PHPCI/Plugin/EmailTest.php index 183d17e5..965b23c4 100644 --- a/Tests/PHPCI/Plugin/EmailTest.php +++ b/Tests/PHPCI/Plugin/EmailTest.php @@ -209,6 +209,45 @@ class EmailTest extends \PHPUnit_Framework_TestCase $this->assertContains('default-mailto-address@example.com', $this->message['to']); } + /** + * @covers PHPUnit::execute + */ + public function testExecute_UniqueRecipientsFromWithCommitter() + { + $this->loadEmailPluginWithOptions( + array( + 'addresses' => array('test-receiver@example.com', 'test-receiver2@example.com') + ) + ); + + $returnValue = $this->testedEmailPlugin->execute(); + $this->assertTrue($returnValue); + + $this->assertCount(2, $this->message['to']); + + $this->assertContains('test-receiver@example.com', $this->message['to']); + $this->assertContains('test-receiver2@example.com', $this->message['to']); + } + + /** + * @covers PHPUnit::execute + */ + public function testExecute_UniqueRecipientsWithCommiter() + { + $this->loadEmailPluginWithOptions( + array( + 'commiter' => true, + 'addresses' => array('test-receiver@example.com', 'committer@test.com') + ) + ); + + $returnValue = $this->testedEmailPlugin->execute(); + $this->assertTrue($returnValue); + + $this->assertContains('test-receiver@example.com', $this->message['to']); + $this->assertContains('committer@test.com', $this->message['to']); + } + /** * @covers PHPUnit::execute */ From 7c4a9261660598355a34647bd161fe3e4a55cb3a Mon Sep 17 00:00:00 2001 From: Tobias van Beek Date: Mon, 16 Feb 2015 15:00:37 +0100 Subject: [PATCH 108/329] Render the public key on the project edit page. CLose #722 done by @leewillis77 --- PHPCI/Controller/ProjectController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Controller/ProjectController.php b/PHPCI/Controller/ProjectController.php index b263f06e..8457a7bb 100644 --- a/PHPCI/Controller/ProjectController.php +++ b/PHPCI/Controller/ProjectController.php @@ -268,7 +268,7 @@ class ProjectController extends PHPCI\Controller $view->type = 'edit'; $view->project = $project; $view->form = $form; - $view->key = null; + $view->key = $values['pubkey']; return $view->render(); } From 33f2ec172d594da2f49da8802c02dd01a9d3c43a Mon Sep 17 00:00:00 2001 From: Daniel Wolkenhauer Date: Mon, 16 Feb 2015 18:51:05 +0100 Subject: [PATCH 109/329] Fatal error: Call to undefined method PHPCI\Helper\Email::setIsHtml() in ../Email.php on line 107 --- PHPCI/Plugin/Email.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Plugin/Email.php b/PHPCI/Plugin/Email.php index 02987e9b..9e361d91 100644 --- a/PHPCI/Plugin/Email.php +++ b/PHPCI/Plugin/Email.php @@ -104,7 +104,7 @@ class Email implements \PHPCI\Plugin $email->setEmailTo($toAddress, $toAddress); $email->setSubject($subject); $email->setBody($body); - $email->setIsHtml(true); + $email->setHtml(true); if (is_array($ccList) && count($ccList)) { foreach ($ccList as $address) { From 8f5d855193e6b67cd042ac61c8d9553359d6b8d5 Mon Sep 17 00:00:00 2001 From: James Inman Date: Wed, 18 Feb 2015 14:07:26 +0000 Subject: [PATCH 110/329] Adding Technical Debt plugin. --- PHPCI/Languages/lang.en.php | 1 + PHPCI/Plugin/TechnicalDebt.php | 183 ++++++++++++++++++ .../assets/js/build-plugins/technical_debt.js | 79 ++++++++ 3 files changed, 263 insertions(+) create mode 100755 PHPCI/Plugin/TechnicalDebt.php create mode 100755 public/assets/js/build-plugins/technical_debt.js diff --git a/PHPCI/Languages/lang.en.php b/PHPCI/Languages/lang.en.php index 9718e442..5f21d3dc 100644 --- a/PHPCI/Languages/lang.en.php +++ b/PHPCI/Languages/lang.en.php @@ -183,6 +183,7 @@ PHPCI', 'phpmd' => 'PHP Mess Detector', 'phpspec' => 'PHP Spec', 'phpunit' => 'PHP Unit', + 'technical_debt' => 'Technical Debt', 'file' => 'File', 'line' => 'Line', diff --git a/PHPCI/Plugin/TechnicalDebt.php b/PHPCI/Plugin/TechnicalDebt.php new file mode 100755 index 00000000..4d82dd25 --- /dev/null +++ b/PHPCI/Plugin/TechnicalDebt.php @@ -0,0 +1,183 @@ + +* @package PHPCI +* @subpackage Plugins +*/ +class TechnicalDebt implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin +{ + /** + * @var \PHPCI\Builder + */ + protected $phpci; + + /** + * @var array + */ + protected $suffixes; + + /** + * @var string + */ + protected $directory; + + /** + * @var int + */ + protected $allowed_errors; + + /** + * @var int + */ + protected $allowed_warnings; + + /** + * @var string, based on the assumption the root may not hold the code to be + * tested, extends the base path + */ + protected $path; + + /** + * @var array - paths to ignore + */ + protected $ignore; + + /** + * @var array - terms to search for + */ + protected $searches; + + public static function canExecute($stage, Builder $builder, Build $build) + { + if ($stage == 'test') { + return true; + } + + return false; + } + + /** + * @param \PHPCI\Builder $phpci + * @param \PHPCI\Model\Build $build + * @param array $options + */ + public function __construct(Builder $phpci, Build $build, array $options = array()) + { + $this->phpci = $phpci; + $this->build = $build; + $this->suffixes = array('php'); + $this->directory = $phpci->buildPath; + $this->path = ''; + $this->ignore = $this->phpci->ignore; + $this->allowed_warnings = 0; + $this->allowed_errors = 0; + $this->searches = array('TODO', 'FIXME', 'TO DO', 'FIX ME'); + + if (isset($options['searches']) && is_array($options['searches'])) { + $this->searches = $options['searches']; + } + + if (isset($options['zero_config']) && $options['zero_config']) { + $this->allowed_warnings = -1; + $this->allowed_errors = -1; + } + } + + protected function setOptions($options) + { + foreach (array('directory', 'path', 'ignore', 'allowed_warnings', 'allowed_errors') as $key) { + if (array_key_exists($key, $options)) { + $this->{$key} = $options[$key]; + } + } + } + + /** + * Runs in a specified directory, to a specified standard. + */ + public function execute() + { + $this->phpci->logExecOutput(false); + + $ignores = $this->ignore; + $ignores[] = 'phpci.yml'; + + $dirIterator = new \RecursiveDirectoryIterator($this->directory); + $iterator = new \RecursiveIteratorIterator($dirIterator, \RecursiveIteratorIterator::SELF_FIRST); + $files = []; + + foreach ($iterator as $file) { + $filePath = $file->getRealPath(); + $skipFile = false; + foreach ($ignores as $ignore) { + if (stripos($filePath, $ignore) !== false) { + $skipFile = true; + break; + } + } + + // Ignore hidden files, else .git, .sass_cache, etc. all get looped over + if (stripos($filePath, '/.') !== false) { + $skipFile = true; + } + + if ($skipFile == false) { + $files[] = $file->getRealPath(); + } + } + + $files = array_filter(array_unique($files)); + $errorCount = 0; + $data = array(); + + foreach ($files as $file) { + foreach ($this->searches as $search) { + $fileContent = file_get_contents($file); + $allLines = explode(PHP_EOL, $fileContent); + $beforeString = strstr($fileContent, $search, true); + + if (false !== $beforeString) { + $lines = explode(PHP_EOL, $beforeString); + $lineNumber = count($lines); + $content = trim($allLines[$lineNumber - 1]); + + $errorCount++; + $this->phpci->log("Found $search on line $lineNumber of $file:\n$content"); + $data[] = array( + 'file' => str_replace($this->directory, '', $file), + 'line' => $lineNumber, + 'message' => $content + ); + } + } + } + + $this->phpci->log("Found $errorCount instances of " . implode(', ', $this->searches)); + + $this->build->storeMeta('technical_debt-warnings', $errorCount); + $this->build->storeMeta('technical_debt-data', $data); + + if ($this->allowed_errors != -1 && $errorCount > $this->allowed_errors) { + $success = false; + } + + return $success; + } +} + diff --git a/public/assets/js/build-plugins/technical_debt.js b/public/assets/js/build-plugins/technical_debt.js new file mode 100755 index 00000000..a187401d --- /dev/null +++ b/public/assets/js/build-plugins/technical_debt.js @@ -0,0 +1,79 @@ +var TechnicalDebtPlugin = ActiveBuild.UiPlugin.extend({ + id: 'build-technical_debt', + css: 'col-lg-6 col-md-12 col-sm-12 col-xs-12', + title: Lang.get('technical_debt'), + lastData: null, + box: true, + rendered: false, + + register: function() { + var self = this; + var query = ActiveBuild.registerQuery('technical_debt-data', -1, {key: 'technical_debt-data'}) + + $(window).on('technical_debt-data', function(data) { + self.onUpdate(data); + }); + + $(window).on('build-updated', function() { + if (!self.rendered) { + query(); + } + }); + }, + + render: function() { + return $('
    ' + + '' + + '' + + ' ' + + ' ' + + ' ' + + '' + + '
    '+Lang.get('file')+''+Lang.get('line')+''+Lang.get('message')+'
    '); + }, + + onUpdate: function(e) { + if (!e.queryData) { + $('#build-technical_debt').hide(); + return; + } + + this.rendered = true; + this.lastData = e.queryData; + + var errors = this.lastData[0].meta_value; + var tbody = $('#technical_debt-data tbody'); + tbody.empty(); + + if (errors.length == 0) { + $('#build-technical_debt').hide(); + return; + } + + for (var i in errors) { + var file = errors[i].file; + + if (ActiveBuild.fileLinkTemplate) { + var fileLink = ActiveBuild.fileLinkTemplate.replace('{FILE}', file); + fileLink = fileLink.replace('{LINE}', errors[i].line); + + file = '' + file + ''; + } + + var row = $('' + + ''+file+'' + + ''+errors[i].line+'' + + ''+errors[i].message+''); + + if (errors[i].type == 'ERROR') { + row.addClass('danger'); + } + + tbody.append(row); + } + + $('#build-technical_debt').show(); + } +}); + +ActiveBuild.registerPlugin(new TechnicalDebtPlugin()); From 2a5ac8ccbcd478de08f036c5ababd4099c5b49e8 Mon Sep 17 00:00:00 2001 From: James Inman Date: Wed, 18 Feb 2015 14:15:59 +0000 Subject: [PATCH 111/329] PHPCS/DocBlock fixes to Technical Debt plugin. --- PHPCI/Plugin/TechnicalDebt.php | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/PHPCI/Plugin/TechnicalDebt.php b/PHPCI/Plugin/TechnicalDebt.php index 4d82dd25..408f40fb 100755 --- a/PHPCI/Plugin/TechnicalDebt.php +++ b/PHPCI/Plugin/TechnicalDebt.php @@ -63,6 +63,15 @@ class TechnicalDebt implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin */ protected $searches; + + /** + * Check if this plugin can be executed. + * + * @param $stage + * @param Builder $builder + * @param Build $build + * @return bool + */ public static function canExecute($stage, Builder $builder, Build $build) { if ($stage == 'test') { @@ -99,6 +108,10 @@ class TechnicalDebt implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin } } + /** + * Handle this plugin's options. + * @param $options + */ protected function setOptions($options) { foreach (array('directory', 'path', 'ignore', 'allowed_warnings', 'allowed_errors') as $key) { @@ -123,7 +136,7 @@ class TechnicalDebt implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin $files = []; foreach ($iterator as $file) { - $filePath = $file->getRealPath(); + $filePath = $file->getRealPath(); $skipFile = false; foreach ($ignores as $ignore) { if (stripos($filePath, $ignore) !== false) { @@ -168,7 +181,7 @@ class TechnicalDebt implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin } } - $this->phpci->log("Found $errorCount instances of " . implode(', ', $this->searches)); + $this->phpci->log("Found $errorCount instances of " . implode(', ', $this->searches)); $this->build->storeMeta('technical_debt-warnings', $errorCount); $this->build->storeMeta('technical_debt-data', $data); @@ -180,4 +193,3 @@ class TechnicalDebt implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin return $success; } } - From d6f72b0b7e66c74ae70db440d379a3000637279d Mon Sep 17 00:00:00 2001 From: James Inman Date: Wed, 18 Feb 2015 14:26:21 +0000 Subject: [PATCH 112/329] PHPCS/PHPMD fixes for Technical Debt plugin. --- PHPCI/Plugin/TechnicalDebt.php | 40 +++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/PHPCI/Plugin/TechnicalDebt.php b/PHPCI/Plugin/TechnicalDebt.php index 408f40fb..71ff0052 100755 --- a/PHPCI/Plugin/TechnicalDebt.php +++ b/PHPCI/Plugin/TechnicalDebt.php @@ -122,21 +122,42 @@ class TechnicalDebt implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin } /** - * Runs in a specified directory, to a specified standard. + * Runs the plugin */ public function execute() { $this->phpci->logExecOutput(false); - $ignores = $this->ignore; - $ignores[] = 'phpci.yml'; + list($errorCount, $data) = $this->getErrorList(); + $this->phpci->log("Found $errorCount instances of " . implode(', ', $this->searches)); + + $this->build->storeMeta('technical_debt-warnings', $errorCount); + $this->build->storeMeta('technical_debt-data', $data); + + if ($this->allowed_errors != -1 && $errorCount > $this->allowed_errors) { + $success = false; + } + + return $success; + } + + /** + * Gets the number and list of errors returned from the search + * + * @return array + */ + public function getErrorList() + { $dirIterator = new \RecursiveDirectoryIterator($this->directory); $iterator = new \RecursiveIteratorIterator($dirIterator, \RecursiveIteratorIterator::SELF_FIRST); $files = []; + $ignores = $this->ignore; + $ignores[] = 'phpci.yml'; + foreach ($iterator as $file) { - $filePath = $file->getRealPath(); + $filePath = $file->getRealPath(); $skipFile = false; foreach ($ignores as $ignore) { if (stripos($filePath, $ignore) !== false) { @@ -180,16 +201,5 @@ class TechnicalDebt implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin } } } - - $this->phpci->log("Found $errorCount instances of " . implode(', ', $this->searches)); - - $this->build->storeMeta('technical_debt-warnings', $errorCount); - $this->build->storeMeta('technical_debt-data', $data); - - if ($this->allowed_errors != -1 && $errorCount > $this->allowed_errors) { - $success = false; - } - - return $success; } } From 5bb68507d836bf94be3c7ebd8a87f5411311224f Mon Sep 17 00:00:00 2001 From: James Inman Date: Wed, 18 Feb 2015 14:56:04 +0000 Subject: [PATCH 113/329] Fixing Technical Debt error message. --- PHPCI/Plugin/TechnicalDebt.php | 1 + 1 file changed, 1 insertion(+) diff --git a/PHPCI/Plugin/TechnicalDebt.php b/PHPCI/Plugin/TechnicalDebt.php index 71ff0052..c10e7d29 100755 --- a/PHPCI/Plugin/TechnicalDebt.php +++ b/PHPCI/Plugin/TechnicalDebt.php @@ -126,6 +126,7 @@ class TechnicalDebt implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin */ public function execute() { + $success = true; $this->phpci->logExecOutput(false); list($errorCount, $data) = $this->getErrorList(); From bf6ac530a67e0385032ed653338c34625fec82b8 Mon Sep 17 00:00:00 2001 From: Jon Gotlin Date: Thu, 4 Dec 2014 12:31:21 +0100 Subject: [PATCH 114/329] Create admin command cleanup --- .gitignore | 1 + PHPCI/Command/CreateAdminCommand.php | 129 ++++++------------ PHPCI/Command/InstallCommand.php | 6 +- .../PHPCI/Command/CreateAdminCommandTest.php | 78 +++++++++++ console | 5 +- 5 files changed, 129 insertions(+), 90 deletions(-) create mode 100644 Tests/PHPCI/Command/CreateAdminCommandTest.php diff --git a/.gitignore b/.gitignore index 79784a60..63e81c5b 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ PHPCI/Model/Base/MigrationBase.php PHPCI/Store/MigrationStore.php PHPCI/Store/Base/MigrationStoreBase.php local_vars.php +Tests/PHPCI/config.yml diff --git a/PHPCI/Command/CreateAdminCommand.php b/PHPCI/Command/CreateAdminCommand.php index 3b69afd3..265f03b4 100644 --- a/PHPCI/Command/CreateAdminCommand.php +++ b/PHPCI/Command/CreateAdminCommand.php @@ -9,21 +9,36 @@ namespace PHPCI\Command; -use PHPCI\Helper\Lang; use PHPCI\Service\UserService; +use PHPCI\Helper\Lang; +use PHPCI\Store\UserStore; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use b8\Store\Factory; /** -* Create admin command - creates an admin user -* @author Wogan May (@woganmay) -* @package PHPCI -* @subpackage Console -*/ + * Create admin command - creates an admin user + * @author Wogan May (@woganmay) + * @package PHPCI + * @subpackage Console + */ class CreateAdminCommand extends Command { + /** + * @var UserStore + */ + protected $userStore; + + /** + * @param UserStore $userStore + */ + public function __construct(UserStore $userStore) + { + parent::__construct(); + + $this->userStore = $userStore; + } + protected function configure() { $this @@ -32,92 +47,36 @@ class CreateAdminCommand extends Command } /** - * Creates an admin user in the existing PHPCI database - */ + * Creates an admin user in the existing PHPCI database + * + * {@inheritDoc} + */ protected function execute(InputInterface $input, OutputInterface $output) { - $userStore = Factory::getStore('User'); - $userService = new UserService($userStore); + $userService = new UserService($this->userStore); - require(PHPCI_DIR . 'bootstrap.php'); + /** @var $dialog \Symfony\Component\Console\Helper\DialogHelper */ + $dialog = $this->getHelperSet()->get('dialog'); - // Try to create a user account: - $adminEmail = $this->ask(Lang::get('enter_email'), true, FILTER_VALIDATE_EMAIL); + // Function to validate mail address. + $mailValidator = function ($answer) { + if (!filter_var($answer, FILTER_VALIDATE_EMAIL)) { + throw new \InvalidArgumentException(Lang::get('must_be_valid_email')); + } - if (empty($adminEmail)) { - return; - } + return $answer; + }; - $adminPass = $this->ask(Lang::get('enter_pass')); - $adminName = $this->ask(Lang::get('enter_name')); + $adminEmail = $dialog->askAndValidate($output, Lang::get('enter_email'), $mailValidator, false); + $adminName = $dialog->ask($output, Lang::get('enter_name')); + $adminPass = $dialog->askHiddenResponse($output, Lang::get('enter_password')); try { - $userService->createUser($adminName, $adminEmail, $adminPass, 1); - print Lang::get('user_created') . PHP_EOL; - } catch (\Exception $ex) { - print Lang::get('failed_to_create') . PHP_EOL; - print $ex->getMessage(); - print PHP_EOL; + $userService->createUser($adminName, $adminEmail, $adminPass, true); + $output->writeln(Lang::get('user_created')); + } catch (\Exception $e) { + $output->writeln(sprintf('%s', Lang::get('failed_to_create'))); + $output->writeln(sprintf('%s', $e->getMessage())); } } - - protected function ask($question, $emptyOk = false, $validationFilter = null) - { - print $question . ' '; - - $rtn = ''; - $stdin = fopen('php://stdin', 'r'); - $rtn = fgets($stdin); - fclose($stdin); - - $rtn = trim($rtn); - - if (!$emptyOk && empty($rtn)) { - $rtn = $this->ask($question, $emptyOk, $validationFilter); - } elseif (!is_null($validationFilter) && ! empty($rtn)) { - if (! $this -> controlFormat($rtn, $validationFilter, $statusMessage)) { - print $statusMessage; - $rtn = $this->ask($question, $emptyOk, $validationFilter); - } - } - - return $rtn; - } - protected function controlFormat($valueToInspect, $filter, &$statusMessage) - { - $filters = !(is_array($filter))? array($filter) : $filter; - $statusMessage = ''; - $status = true; - $options = array(); - - foreach ($filters as $filter) { - if (! is_int($filter)) { - $regexp = $filter; - $filter = FILTER_VALIDATE_REGEXP; - $options = array( - 'options' => array( - 'regexp' => $regexp, - ) - ); - } - if (! filter_var($valueToInspect, $filter, $options)) { - $status = false; - - switch ($filter) - { - case FILTER_VALIDATE_URL: - $statusMessage = Lang::get('must_be_valid_url') . PHP_EOL; - break; - case FILTER_VALIDATE_EMAIL: - $statusMessage = Lang::get('must_be_valid_email') . PHP_EOL; - break; - case FILTER_VALIDATE_REGEXP: - $statusMessage = Lang::get('incorrect_format') . PHP_EOL; - break; - } - } - } - - return $status; - } } diff --git a/PHPCI/Command/InstallCommand.php b/PHPCI/Command/InstallCommand.php index d262b9f0..04e0f2dd 100644 --- a/PHPCI/Command/InstallCommand.php +++ b/PHPCI/Command/InstallCommand.php @@ -95,7 +95,7 @@ class InstallCommand extends Command $this->writeConfigFile($conf); $this->setupDatabase($output); - $admin = $this->getAdminInforamtion($input, $output); + $admin = $this->getAdminInformation($input, $output); $this->createAdminUser($admin, $output); } @@ -160,7 +160,7 @@ class InstallCommand extends Command * @param OutputInterface $output * @return array */ - protected function getAdminInforamtion(InputInterface $input, OutputInterface $output) + protected function getAdminInformation(InputInterface $input, OutputInterface $output) { $admin = array(); @@ -172,7 +172,7 @@ class InstallCommand extends Command // Function to validate mail address. $mailValidator = function ($answer) { if (!filter_var($answer, FILTER_VALIDATE_EMAIL)) { - throw new Exception(Lang::get('must_be_valid_email')); + throw new \InvalidArgumentException(Lang::get('must_be_valid_email')); } return $answer; diff --git a/Tests/PHPCI/Command/CreateAdminCommandTest.php b/Tests/PHPCI/Command/CreateAdminCommandTest.php new file mode 100644 index 00000000..738d8f8a --- /dev/null +++ b/Tests/PHPCI/Command/CreateAdminCommandTest.php @@ -0,0 +1,78 @@ +command = $this->getMockBuilder('PHPCI\\Command\\CreateAdminCommand') + ->setConstructorArgs([$this->getMock('PHPCI\\Store\\UserStore')]) + ->setMethods(['reloadConfig']) + ->getMock() + ; + + $this->dialog = $this->getMockBuilder('Symfony\\Component\\Console\\Helper\\DialogHelper') + ->setMethods([ + 'ask', + 'askAndValidate', + 'askHiddenResponse', + ]) + ->getMock() + ; + + $this->application = new Application(); + } + + /** + * @return CommandTester + */ + protected function getCommandTester() + { + $this->application->getHelperSet()->set($this->dialog, 'dialog'); + $this->application->add($this->command); + $command = $this->application->find('phpci:create-admin'); + $commandTester = new CommandTester($command); + + return $commandTester; + } + + public function testExecute() + { + $this->dialog->expects($this->at(0))->method('askAndValidate')->will($this->returnValue('test@example.com')); + $this->dialog->expects($this->at(1))->method('ask')->will($this->returnValue('A name')); + $this->dialog->expects($this->at(2))->method('askHiddenResponse')->will($this->returnValue('foobar123')); + + $commandTester = $this->getCommandTester(); + $commandTester->execute([]); + + $this->assertEquals('User account created!' . PHP_EOL, $commandTester->getDisplay()); + } +} diff --git a/console b/console index 43fc2b8f..782cc2d0 100755 --- a/console +++ b/console @@ -20,6 +20,7 @@ use PHPCI\Command\DaemonCommand; use PHPCI\Command\PollCommand; use PHPCI\Command\CreateAdminCommand; use Symfony\Component\Console\Application; +use b8\Store\Factory; $application = new Application(); @@ -29,6 +30,6 @@ $application->add(new UpdateCommand($loggerConfig->getFor('UpdateCommand'))); $application->add(new GenerateCommand); $application->add(new DaemonCommand($loggerConfig->getFor('DaemonCommand'))); $application->add(new PollCommand($loggerConfig->getFor('PollCommand'))); -$application->add(new CreateAdminCommand); +$application->add(new CreateAdminCommand(Factory::getStore('User'))); -$application->run(); \ No newline at end of file +$application->run(); From 6c8df9a8cee8fe5a5c85cd6a9b937f11cdfd92dc Mon Sep 17 00:00:00 2001 From: James Inman Date: Thu, 19 Feb 2015 13:37:35 +0000 Subject: [PATCH 115/329] Fix missing return statement in Technical Debt. --- PHPCI/Plugin/TechnicalDebt.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/PHPCI/Plugin/TechnicalDebt.php b/PHPCI/Plugin/TechnicalDebt.php index c10e7d29..fed76566 100755 --- a/PHPCI/Plugin/TechnicalDebt.php +++ b/PHPCI/Plugin/TechnicalDebt.php @@ -202,5 +202,7 @@ class TechnicalDebt implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin } } } + + return array($errorCount, $data); } } From 69d05d6da8ac9497c02de4a600075db1c9616ed3 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Fri, 20 Feb 2015 12:46:43 +0000 Subject: [PATCH 116/329] Setup plugin failure should cease execution. Fixes #797 --- PHPCI/Plugin/Util/Executor.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/PHPCI/Plugin/Util/Executor.php b/PHPCI/Plugin/Util/Executor.php index bbc9507c..8782e231 100644 --- a/PHPCI/Plugin/Util/Executor.php +++ b/PHPCI/Plugin/Util/Executor.php @@ -60,6 +60,11 @@ class Executor $this->logger->logSuccess(Lang::get('plugin_success')); } else { + // If we're in the "setup" stage, execution should not continue after + // a plugin has failed: + if ($stage == 'setup') { + throw new \Exception('Plugin failed: ' . $plugin); + } // If we're in the "test" stage and the plugin is not allowed to fail, // then mark the build as failed: From 1f4fb58014f8ccae910f6bf279ba6ef3c1afd22e Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Fri, 20 Feb 2015 13:11:31 +0000 Subject: [PATCH 117/329] Update session cookie to last 12 hours. --- public/index.php | 1 + 1 file changed, 1 insertion(+) diff --git a/public/index.php b/public/index.php index 4d68e76b..56ebed12 100644 --- a/public/index.php +++ b/public/index.php @@ -7,6 +7,7 @@ * @link https://www.phptesting.org/ */ +session_set_cookie_params(43200); // Set session cookie to last 12 hours. session_start(); require_once('../bootstrap.php'); From 9133c544d59e22f57a3ec3372c2a9006072b51b4 Mon Sep 17 00:00:00 2001 From: James Inman Date: Wed, 18 Feb 2015 16:51:55 +0000 Subject: [PATCH 118/329] Adding output support to Behat plugin. --- PHPCI/Languages/lang.en.php | 1 + PHPCI/Plugin/Behat.php | 52 +++++++++++++++++ PHPCI/Plugin/TechnicalDebt.php | 2 - public/assets/js/build-plugins/behat.js | 74 +++++++++++++++++++++++++ 4 files changed, 127 insertions(+), 2 deletions(-) create mode 100644 public/assets/js/build-plugins/behat.js diff --git a/PHPCI/Languages/lang.en.php b/PHPCI/Languages/lang.en.php index 5f21d3dc..da767727 100644 --- a/PHPCI/Languages/lang.en.php +++ b/PHPCI/Languages/lang.en.php @@ -184,6 +184,7 @@ PHPCI', 'phpspec' => 'PHP Spec', 'phpunit' => 'PHP Unit', 'technical_debt' => 'Technical Debt', + 'behat' => 'Behat', 'file' => 'File', 'line' => 'Line', diff --git a/PHPCI/Plugin/Behat.php b/PHPCI/Plugin/Behat.php index 0e2fe69b..ad2956b4 100644 --- a/PHPCI/Plugin/Behat.php +++ b/PHPCI/Plugin/Behat.php @@ -66,12 +66,64 @@ class Behat implements \PHPCI\Plugin if (!$behat) { $this->phpci->logFailure(Lang::get('could_not_find', 'behat')); + return false; } $success = $this->phpci->executeCommand($behat . ' %s', $this->features); chdir($curdir); + list($errorCount, $data) = $this->parseBehatOutput(); + + $this->build->storeMeta('behat-warnings', $errorCount); + $this->build->storeMeta('behat-data', $data); + return $success; } + + /** + * Parse the behat output and return details on failures + * + * @return array + */ + public function parseBehatOutput() + { + $output = $this->phpci->getLastOutput(); + + $parts = explode('---', $output); + + if (count($parts) <= 1) { + return array(0, array()); + } + + $lines = explode(PHP_EOL, $parts[1]); + + $errorCount = 0; + $storeFailures = false; + $data = []; + + foreach ($lines as $line) { + $line = trim($line); + if ($line == 'Failed scenarios:') { + $storeFailures = true; + continue; + } + + if (strpos($line, ':') === false) { + $storeFailures = false; + } + + if ($storeFailures) { + $lineParts = explode(':', $line); + $data[] = array( + 'file' => $lineParts[0], + 'line' => $lineParts[1] + ); + } + } + + $errorCount = count($data); + + return array($errorCount, $data); + } } diff --git a/PHPCI/Plugin/TechnicalDebt.php b/PHPCI/Plugin/TechnicalDebt.php index fed76566..c10e7d29 100755 --- a/PHPCI/Plugin/TechnicalDebt.php +++ b/PHPCI/Plugin/TechnicalDebt.php @@ -202,7 +202,5 @@ class TechnicalDebt implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin } } } - - return array($errorCount, $data); } } diff --git a/public/assets/js/build-plugins/behat.js b/public/assets/js/build-plugins/behat.js new file mode 100644 index 00000000..4140a267 --- /dev/null +++ b/public/assets/js/build-plugins/behat.js @@ -0,0 +1,74 @@ +var BehatPlugin = ActiveBuild.UiPlugin.extend({ + id: 'build-behat', + css: 'col-lg-6 col-md-12 col-sm-12 col-xs-12', + title: Lang.get('behat'), + lastData: null, + box: true, + rendered: false, + + register: function() { + var self = this; + var query = ActiveBuild.registerQuery('behat-data', -1, {key: 'behat-data'}) + + $(window).on('behat-data', function(data) { + self.onUpdate(data); + }); + + $(window).on('build-updated', function() { + if (!self.rendered) { + query(); + } + }); + }, + + render: function() { + return $('
    ' + + '' + + '' + + ' ' + + ' ' + + '' + + '
    '+Lang.get('file')+''+Lang.get('line')+'
    '); + }, + + onUpdate: function(e) { + if (!e.queryData) { + $('#build-behat').hide(); + return; + } + + this.rendered = true; + this.lastData = e.queryData; + + var errors = this.lastData[0].meta_value; + var tbody = $('#behat-data tbody'); + tbody.empty(); + + if (errors.length == 0) { + $('#build-behat').hide(); + return; + } + + for (var i in errors) { + var file = errors[i].file; + + if (ActiveBuild.fileLinkTemplate) { + var fileLink = ActiveBuild.fileLinkTemplate.replace('{FILE}', file); + fileLink = fileLink.replace('{LINE}', errors[i].line); + + file = '' + file + ''; + } + + var row = $('' + + ''+file+'' + + ''+errors[i].line+'' + + ''); + + tbody.append(row); + } + + $('#build-behat').show(); + } +}); + +ActiveBuild.registerPlugin(new BehatPlugin()); From 35a6d1f5773a81d9836b45cf5bc704ac53aaee4e Mon Sep 17 00:00:00 2001 From: Dzhilkibaev Nadir Date: Mon, 26 Jan 2015 21:12:48 +0300 Subject: [PATCH 119/329] Add SVN support to PHPCI. Closes #759 --- PHPCI/BuildFactory.php | 3 + PHPCI/Controller/ProjectController.php | 3 +- PHPCI/Languages/lang.en.php | 1 + PHPCI/Model/Build/SubversionBuild.php | 182 +++++++++++++++++++++++++ 4 files changed, 188 insertions(+), 1 deletion(-) create mode 100644 PHPCI/Model/Build/SubversionBuild.php diff --git a/PHPCI/BuildFactory.php b/PHPCI/BuildFactory.php index 4825047d..ecc37c43 100644 --- a/PHPCI/BuildFactory.php +++ b/PHPCI/BuildFactory.php @@ -61,6 +61,9 @@ class BuildFactory case 'hg': $type = 'MercurialBuild'; break; + case 'svn': + $type = 'SubversionBuild'; + break; } $type = '\\PHPCI\\Model\\Build\\' . $type; diff --git a/PHPCI/Controller/ProjectController.php b/PHPCI/Controller/ProjectController.php index 8457a7bb..f2f63b26 100644 --- a/PHPCI/Controller/ProjectController.php +++ b/PHPCI/Controller/ProjectController.php @@ -311,10 +311,11 @@ class ProjectController extends PHPCI\Controller 'remote' => Lang::get('remote'), 'local' => Lang::get('local'), 'hg' => Lang::get('hg'), + 'svn' => Lang::get('svn'), ); $field = Form\Element\Select::create('type', Lang::get('where_hosted'), true); - $field->setPattern('^(github|bitbucket|gitlab|remote|local|hg)'); + $field->setPattern('^(github|bitbucket|gitlab|remote|local|hg|svn)'); $field->setOptions($options); $field->setClass('form-control')->setContainerClass('form-group'); $form->addField($field); diff --git a/PHPCI/Languages/lang.en.php b/PHPCI/Languages/lang.en.php index da767727..ec2306e0 100644 --- a/PHPCI/Languages/lang.en.php +++ b/PHPCI/Languages/lang.en.php @@ -101,6 +101,7 @@ PHPCI', 'remote' => 'Remote URL', 'local' => 'Local Path', 'hg' => 'Mercurial', + 'svn' => 'Subversion', 'where_hosted' => 'Where is your project hosted?', 'choose_github' => 'Choose a GitHub repository:', diff --git a/PHPCI/Model/Build/SubversionBuild.php b/PHPCI/Model/Build/SubversionBuild.php new file mode 100644 index 00000000..af884933 --- /dev/null +++ b/PHPCI/Model/Build/SubversionBuild.php @@ -0,0 +1,182 @@ + + * @package PHPCI + * @subpackage Core + */ +class SubversionBuild extends Build +{ + protected $svnCommand = 'svn export -q --non-interactive '; + + /** + * Get the URL to be used to clone this remote repository. + */ + protected function getCloneUrl() + { + $url = $this->getProject()->getReference(); + + if (substr($url, -1) != '/') { + $url .= '/'; + } + + $branch = $this->getBranch(); + + if (empty($branch) || $branch == 'trunk') { + $url .= 'trunk'; + } else { + $url .= 'branches/' . $branch; + } + + return $url; + } + + /** + * @param Builder $builder + * + * @return void + */ + protected function extendSvnCommandFromConfig(Builder $builder) + { + $cmd = $this->svnCommand; + + $svn = $builder->getConfig('svn'); + if ($svn) { + foreach ($svn as $key => $value) { + $cmd .= " --$key $value "; + } + } + + $depth = $builder->getConfig('clone_depth'); + + if (!is_null($depth)) { + $cmd .= ' --depth ' . intval($depth) . ' '; + } + + $this->svnCommand = $cmd; + } + + /** + * Create a working copy by cloning, copying, or similar. + */ + public function createWorkingCopy(Builder $builder, $buildPath) + { + $this->handleConfig($builder, $buildPath); + + $this->extendSvnCommandFromConfig($builder); + + $key = trim($this->getProject()->getSshPrivateKey()); + + if (!empty($key)) { + $success = $this->cloneBySsh($builder, $buildPath); + } else { + $success = $this->cloneByHttp($builder, $buildPath); + } + + if (!$success) { + $builder->logFailure('Failed to export remote subversion repository.'); + return false; + } + + return $this->handleConfig($builder, $buildPath); + } + + /** + * Use an HTTP-based svn export. + */ + protected function cloneByHttp(Builder $builder, $cloneTo) + { + $cmd = $this->svnCommand; + + if ($this->getCommitId() != 'Manual') { + $cmd .= ' -r %s %s "%s"'; + $success = $builder->executeCommand($cmd, $this->getCommitId(), $this->getCloneUrl(), $cloneTo); + } else { + $cmd .= ' %s "%s"'; + $success = $builder->executeCommand($cmd, $this->getCloneUrl(), $cloneTo); + } + + return $success; + } + + /** + * Use an SSH-based svn export. + */ + protected function cloneBySsh(Builder $builder, $cloneTo) + { + $cmd = $this->svnCommand . ' %s "%s"'; + + if (!IS_WIN) { + $keyFile = $this->writeSshKey($cloneTo); + $sshWrapper = $this->writeSshWrapper($cloneTo, $keyFile); + $cmd = 'export SVN_SSH="' . $sshWrapper . '" && ' . $cmd; + } + + $success = $builder->executeCommand($cmd, $this->getCloneUrl(), $cloneTo); + + if (!IS_WIN) { + // Remove the key file and svn wrapper: + unlink($keyFile); + unlink($sshWrapper); + } + + return $success; + } + + /** + * Create an SSH key file on disk for this build. + * @param $cloneTo + * @return string + */ + protected function writeSshKey($cloneTo) + { + $keyPath = dirname($cloneTo . '/temp'); + $keyFile = $keyPath . '.key'; + + // Write the contents of this project's svn key to the file: + file_put_contents($keyFile, $this->getProject()->getSshPrivateKey()); + chmod($keyFile, 0600); + + // Return the filename: + return $keyFile; + } + + /** + * Create an SSH wrapper script for Svn to use, to disable host key checking, etc. + * @param $cloneTo + * @param $keyFile + * @return string + */ + protected function writeSshWrapper($cloneTo, $keyFile) + { + $path = dirname($cloneTo . '/temp'); + $wrapperFile = $path . '.sh'; + + $sshFlags = '-o CheckHostIP=no -o IdentitiesOnly=yes -o StrictHostKeyChecking=no -o PasswordAuthentication=no'; + + // Write out the wrapper script for this build: + $script = << Date: Fri, 20 Feb 2015 14:24:37 +0000 Subject: [PATCH 120/329] Slight cleanup to please PHPMD. --- PHPCI/Plugin/Util/Executor.php | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/PHPCI/Plugin/Util/Executor.php b/PHPCI/Plugin/Util/Executor.php index 8782e231..9482c81f 100644 --- a/PHPCI/Plugin/Util/Executor.php +++ b/PHPCI/Plugin/Util/Executor.php @@ -48,27 +48,20 @@ class Executor foreach ($config[$stage] as $plugin => $options) { $this->logger->log(Lang::get('running_plugin', $plugin)); - // Is this plugin allowed to fail? - if ($stage == 'test' && !isset($options['allow_failures'])) { - $options['allow_failures'] = false; - } - // Try and execute it: if ($this->executePlugin($plugin, $options)) { // Execution was successful: $this->logger->logSuccess(Lang::get('plugin_success')); - } else { + } elseif ($stage == 'setup') { // If we're in the "setup" stage, execution should not continue after // a plugin has failed: - if ($stage == 'setup') { - throw new \Exception('Plugin failed: ' . $plugin); - } - + throw new \Exception('Plugin failed: ' . $plugin); + } else { // If we're in the "test" stage and the plugin is not allowed to fail, // then mark the build as failed: - if ($stage == 'test' && !$options['allow_failures']) { + if ($stage == 'test' && (!isset($options['allow_failures']) || !$options['allow_failures'])) { $success = false; } From dd58dd682f153483c7c2aaacbd4cc08d58bdfb46 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Fri, 20 Feb 2015 13:37:36 +0000 Subject: [PATCH 121/329] Adding support for commenting on Github diffs. --- PHPCI/Command/RebuildCommand.php | 92 +++++++++++++++++++++++++++++ PHPCI/Helper/Diff.php | 58 ++++++++++++++++++ PHPCI/Helper/Github.php | 70 ++++++++++++++++++++++ PHPCI/Model/Build.php | 13 ++++ PHPCI/Model/Build/GithubBuild.php | 54 +++++++++++++++++ PHPCI/Plugin/Behat.php | 4 +- PHPCI/Plugin/PhpCodeSniffer.php | 2 + PHPCI/Plugin/PhpCpd.php | 11 ++++ PHPCI/Plugin/PhpDocblockChecker.php | 20 ++++++- PHPCI/Plugin/PhpMessDetector.php | 1 + PHPCI/Plugin/TechnicalDebt.php | 7 ++- PHPCI/Plugin/Util/Factory.php | 4 +- console | 2 + 13 files changed, 333 insertions(+), 5 deletions(-) create mode 100644 PHPCI/Command/RebuildCommand.php create mode 100644 PHPCI/Helper/Diff.php diff --git a/PHPCI/Command/RebuildCommand.php b/PHPCI/Command/RebuildCommand.php new file mode 100644 index 00000000..165d94c7 --- /dev/null +++ b/PHPCI/Command/RebuildCommand.php @@ -0,0 +1,92 @@ + +* @package PHPCI +* @subpackage Console +*/ +class RebuildCommand extends Command +{ + /** + * @var Logger + */ + protected $logger; + + /** + * @var OutputInterface + */ + protected $output; + + /** + * @var boolean + */ + protected $run; + + /** + * @var int + */ + protected $sleep; + + /** + * @param \Monolog\Logger $logger + * @param string $name + */ + public function __construct(Logger $logger, $name = null) + { + parent::__construct($name); + $this->logger = $logger; + } + + protected function configure() + { + $this + ->setName('phpci:rebuild') + ->setDescription('Re-runs the last run build.'); + } + + /** + * Loops through running. + */ + protected function execute(InputInterface $input, OutputInterface $output) + { + $runner = new RunCommand($this->logger); + $runner->setMaxBuilds(1); + $runner->setDaemon(false); + + /** @var \PHPCI\Store\BuildStore $store */ + $store = Factory::getStore('Build'); + $service = new BuildService($store); + + $lastBuild = array_shift($store->getLatestBuilds(null, 1)); + $service->createDuplicateBuild($lastBuild); + + $runner->run(new ArgvInput(array()), $output); + } + + /** + * Called when log entries are made in Builder / the plugins. + * @see \PHPCI\Builder::log() + */ + public function logCallback($log) + { + $this->output->writeln($log); + } +} diff --git a/PHPCI/Helper/Diff.php b/PHPCI/Helper/Diff.php new file mode 100644 index 00000000..e50c7eaf --- /dev/null +++ b/PHPCI/Helper/Diff.php @@ -0,0 +1,58 @@ +get('phpci.github.token'); + + if (!$token) { + return null; + } + + $url = '/repos/' . strtolower($repo) . '/pulls/' . $pullId . '/comments'; + + $params = array( + 'body' => $comment, + 'commit_id' => $commitId, + 'path' => $file, + 'position' => $line, + ); + + $http = new HttpClient('https://api.github.com'); + $http->setHeaders(array( + 'Content-Type: application/x-www-form-urlencoded', + 'Authorization: Basic ' . base64_encode($token . ':x-oauth-basic'), + )); + + $http->post($url, json_encode($params)); + } + + /** + * Create a comment on a Github commit. + * @param $repo + * @param $commitId + * @param $file + * @param $line + * @param $comment + * @return null + */ + public function createCommitComment($repo, $commitId, $file, $line, $comment) + { + $token = Config::getInstance()->get('phpci.github.token'); + + if (!$token) { + return null; + } + + $url = '/repos/' . strtolower($repo) . '/commits/' . $commitId . '/comments'; + + $params = array( + 'body' => $comment, + 'path' => $file, + 'position' => $line, + ); + + $http = new HttpClient('https://api.github.com'); + $http->setHeaders(array( + 'Content-Type: application/x-www-form-urlencoded', + 'Authorization: Basic ' . base64_encode($token . ':x-oauth-basic'), + )); + + $http->post($url, json_encode($params)); + } } diff --git a/PHPCI/Model/Build.php b/PHPCI/Model/Build.php index 5561d51e..3d07778a 100644 --- a/PHPCI/Model/Build.php +++ b/PHPCI/Model/Build.php @@ -204,4 +204,17 @@ class Build extends BuildBase return $rtn; } + + /** + * Allows specific build types (e.g. Github) to report violations back to their respective services. + * @param Builder $builder + * @param $file + * @param $line + * @param $message + * @return mixed + */ + public function reportError(Builder $builder, $file, $line, $message) + { + return array($builder, $file, $line, $message); + } } diff --git a/PHPCI/Model/Build/GithubBuild.php b/PHPCI/Model/Build/GithubBuild.php index caa21979..7c8f3f6f 100644 --- a/PHPCI/Model/Build/GithubBuild.php +++ b/PHPCI/Model/Build/GithubBuild.php @@ -10,6 +10,8 @@ namespace PHPCI\Model\Build; use PHPCI\Builder; +use PHPCI\Helper\Diff; +use PHPCI\Helper\Github; use PHPCI\Model\Build\RemoteGitBuild; /** @@ -167,4 +169,56 @@ class GithubBuild extends RemoteGitBuild return $success; } + + /** + * @inheritDoc + */ + public function reportError(Builder $builder, $file, $line, $message) + { + $diffLineNumber = $this->getDiffLineNumber($builder, $file, $line); + + if (!is_null($diffLineNumber)) { + $helper = new Github(); + + $repo = $this->getProject()->getReference(); + $prNumber = $this->getExtra('pull_request_number'); + $commit = $this->getCommitId(); + + if (!empty($prNumber)) { + $helper->createPullRequestComment($repo, $prNumber, $commit, $file, $diffLineNumber, $message); + } else { + $helper->createCommitComment($repo, $commit, $file, $diffLineNumber, $message); + } + } + } + + /** + * Uses git diff to figure out what the diff line position is, based on the error line number. + * @param Builder $builder + * @param $file + * @param $line + * @return int|null + */ + protected function getDiffLineNumber(Builder $builder, $file, $line) + { + $builder->logExecOutput(false); + + $prNumber = $this->getExtra('pull_request_number'); + $path = $builder->buildPath; + + if (!empty($prNumber)) { + $builder->executeCommand('cd %s && git diff origin/%s "%s"', $path, $this->getBranch(), $file); + } else { + $builder->executeCommand('cd %s && git diff %s^! "%s"', $path, $this->getCommitId(), $file); + } + + $builder->logExecOutput(true); + + $diff = $builder->getLastOutput(); + + $helper = new Diff(); + $lines = $helper->getLinePositions($diff); + + return $lines[$line]; + } } diff --git a/PHPCI/Plugin/Behat.php b/PHPCI/Plugin/Behat.php index ad2956b4..23686270 100644 --- a/PHPCI/Plugin/Behat.php +++ b/PHPCI/Plugin/Behat.php @@ -100,7 +100,7 @@ class Behat implements \PHPCI\Plugin $errorCount = 0; $storeFailures = false; - $data = []; + $data = array(); foreach ($lines as $line) { $line = trim($line); @@ -119,6 +119,8 @@ class Behat implements \PHPCI\Plugin 'file' => $lineParts[0], 'line' => $lineParts[1] ); + + $this->build->reportError($this->phpci, $lineParts[0], $lineParts[1], 'Behat scenario failed.'); } } diff --git a/PHPCI/Plugin/PhpCodeSniffer.php b/PHPCI/Plugin/PhpCodeSniffer.php index 3ee232b7..df276eac 100644 --- a/PHPCI/Plugin/PhpCodeSniffer.php +++ b/PHPCI/Plugin/PhpCodeSniffer.php @@ -237,6 +237,8 @@ class PhpCodeSniffer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin $fileName = str_replace($this->phpci->buildPath, '', $fileName); foreach ($file['messages'] as $message) { + $this->build->reportError($this->phpci, $fileName, $message['line'], 'PHPCS: ' . $message['message']); + $rtn[] = array( 'file' => $fileName, 'line' => $message['line'], diff --git a/PHPCI/Plugin/PhpCpd.php b/PHPCI/Plugin/PhpCpd.php index 9bbcfc09..c663db5a 100644 --- a/PHPCI/Plugin/PhpCpd.php +++ b/PHPCI/Plugin/PhpCpd.php @@ -140,6 +140,17 @@ class PhpCpd implements \PHPCI\Plugin 'line_end' => (int) $file['line'] + (int) $duplication['lines'], 'code' => (string) $duplication->codefragment ); + + $message = <<codefragment} +``` +CPD; + + $this->build->reportError($this->phpci, $fileName, $file['line'], $message); + } $warnings++; diff --git a/PHPCI/Plugin/PhpDocblockChecker.php b/PHPCI/Plugin/PhpDocblockChecker.php index 9650127f..9f71afef 100644 --- a/PHPCI/Plugin/PhpDocblockChecker.php +++ b/PHPCI/Plugin/PhpDocblockChecker.php @@ -143,12 +143,13 @@ class PhpDocblockChecker implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin // Re-enable exec output logging: $this->phpci->logExecOutput(true); - $output = json_decode($this->phpci->getLastOutput()); + $output = json_decode($this->phpci->getLastOutput(), true); $errors = count($output); $success = true; $this->build->storeMeta('phpdoccheck-warnings', $errors); $this->build->storeMeta('phpdoccheck-data', $output); + $this->reportErrors($output); if ($this->allowed_warnings != -1 && $errors > $this->allowed_warnings) { $success = false; @@ -156,4 +157,21 @@ class PhpDocblockChecker implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin return $success; } + + /** + * Report all of the errors we've encountered line-by-line. + * @param $output + */ + protected function reportErrors($output) + { + foreach ($output as $error) { + $message = 'Class ' . $error['class'] . ' does not have a Docblock comment.'; + + if ($error['type'] == 'method') { + $message = 'Method ' . $error['class'] . '::' . $error['method'] . ' does not have a Docblock comment.'; + } + + $this->build->reportError($this->phpci, $error['file'], $error['line'], $message); + } + } } diff --git a/PHPCI/Plugin/PhpMessDetector.php b/PHPCI/Plugin/PhpMessDetector.php index 4603d534..21c171cb 100644 --- a/PHPCI/Plugin/PhpMessDetector.php +++ b/PHPCI/Plugin/PhpMessDetector.php @@ -181,6 +181,7 @@ class PhpMessDetector implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin 'message' => (string)$violation, ); + $this->build->reportError($this->phpci, $fileName, (int)$violation['beginline'], (string)$violation); $data[] = $warning; } } diff --git a/PHPCI/Plugin/TechnicalDebt.php b/PHPCI/Plugin/TechnicalDebt.php index c10e7d29..afe6c920 100755 --- a/PHPCI/Plugin/TechnicalDebt.php +++ b/PHPCI/Plugin/TechnicalDebt.php @@ -194,11 +194,16 @@ class TechnicalDebt implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin $errorCount++; $this->phpci->log("Found $search on line $lineNumber of $file:\n$content"); + + $fileName = str_replace($this->directory, '', $file); $data[] = array( - 'file' => str_replace($this->directory, '', $file), + 'file' => $fileName, 'line' => $lineNumber, 'message' => $content ); + + $this->build->reportError($this->phpci, $fileName, $lineNumber, $content); + } } } diff --git a/PHPCI/Plugin/Util/Factory.php b/PHPCI/Plugin/Util/Factory.php index 5430b56f..8127bcd2 100644 --- a/PHPCI/Plugin/Util/Factory.php +++ b/PHPCI/Plugin/Util/Factory.php @@ -76,11 +76,11 @@ class Factory * be passed along with any resources registered with the factory. * * @param $className - * @param array $options + * @param array|null $options * @throws \InvalidArgumentException if $className doesn't represent a valid plugin * @return \PHPCI\Plugin */ - public function buildPlugin($className, array $options = array()) + public function buildPlugin($className, $options = array()) { $this->currentPluginOptions = $options; diff --git a/console b/console index 782cc2d0..a812fc7f 100755 --- a/console +++ b/console @@ -13,6 +13,7 @@ define('PHPCI_IS_CONSOLE', true); require('bootstrap.php'); use PHPCI\Command\RunCommand; +use PHPCI\Command\RebuildCommand; use PHPCI\Command\GenerateCommand; use PHPCI\Command\UpdateCommand; use PHPCI\Command\InstallCommand; @@ -25,6 +26,7 @@ use b8\Store\Factory; $application = new Application(); $application->add(new RunCommand($loggerConfig->getFor('RunCommand'))); +$application->add(new RebuildCommand($loggerConfig->getFor('RunCommand'))); $application->add(new InstallCommand); $application->add(new UpdateCommand($loggerConfig->getFor('UpdateCommand'))); $application->add(new GenerateCommand); From 1a5ecb97b1ca36b7ae9fa4eec0d277bda045223d Mon Sep 17 00:00:00 2001 From: Leszek Date: Mon, 23 Feb 2015 09:10:17 +0000 Subject: [PATCH 122/329] Update lang.pl.php Closes #810 --- PHPCI/Languages/lang.pl.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/PHPCI/Languages/lang.pl.php b/PHPCI/Languages/lang.pl.php index 4aafc9cf..5bf5e043 100644 --- a/PHPCI/Languages/lang.pl.php +++ b/PHPCI/Languages/lang.pl.php @@ -101,6 +101,7 @@ od wybranego kodu źródłowego platformy hostingowej.', 'remote' => 'Zdalny URL ', 'local' => 'Lokalna Ścieżka ', 'hg' => 'Mercurial', + 'svn' => 'Subversion', 'where_hosted' => 'Gdzie hostowany jest Twój projekt?', 'choose_github' => 'Wybierz repozytorium GitHub:', @@ -181,8 +182,10 @@ Services repozytoria Bitbucket.', 'phpcs' => 'PHP Code Sniffer', 'phpdoccheck' => 'Brakuje sekcji DocBlock', 'phpmd' => 'PHP Mess Detector', - 'phpspec' => 'Speck PHP', - 'phpunit' => 'Jednostka PHP', + 'phpspec' => 'PHPSpec', + 'phpunit' => 'PHPUnit', + 'technical_debt' => 'Dług technologiczny', + 'behat' => 'Behat', 'file' => 'Plik', 'line' => 'Linia', From 4ffeec776716eff2a90bc40326ba01010b7a4bc6 Mon Sep 17 00:00:00 2001 From: corpsee Date: Sun, 22 Feb 2015 01:32:24 +0600 Subject: [PATCH 123/329] Updated lang.ru file Closes #807 --- PHPCI/Languages/lang.ru.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/PHPCI/Languages/lang.ru.php b/PHPCI/Languages/lang.ru.php index 00b2783e..836db6f4 100644 --- a/PHPCI/Languages/lang.ru.php +++ b/PHPCI/Languages/lang.ru.php @@ -99,6 +99,7 @@ PHPCI', 'remote' => 'Внешний URL', 'local' => 'Локальный путь', 'hg' => 'Mercurial', + 'svn' => 'Subversion', 'where_hosted' => 'Расположение проекта', 'choose_github' => 'Выберите GitHub репозиторий:', @@ -178,6 +179,8 @@ PHPCI', 'phpmd' => 'PHP Mess Detector', 'phpspec' => 'PHP Spec', 'phpunit' => 'PHP Unit', + 'technical_debt' => 'Технические долги', + 'behat' => 'Behat', 'file' => 'Файл', 'line' => 'Строка', From 6420119f1af0b0e077d957b9c35f3d9166340523 Mon Sep 17 00:00:00 2001 From: Lee Willis Date: Thu, 19 Feb 2015 21:33:49 +0000 Subject: [PATCH 124/329] Make SSH key generation more robust. Do not try and predict whether we will be able to create a key. Instead try and create one and capture failure if it happens. Closes #803 --- PHPCI/Helper/SshKey.php | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/PHPCI/Helper/SshKey.php b/PHPCI/Helper/SshKey.php index 47bd85bd..932686f2 100644 --- a/PHPCI/Helper/SshKey.php +++ b/PHPCI/Helper/SshKey.php @@ -39,9 +39,9 @@ class SshKey $return = array('private_key' => '', 'public_key' => ''); - if ($this->canGenerateKeys()) { - shell_exec('ssh-keygen -q -t rsa -b 2048 -f '.$keyFile.' -N "" -C "deploy@phpci"'); + $output = @shell_exec('ssh-keygen -t rsa -b 2048 -f '.$keyFile.' -N "" -C "deploy@phpci"'); + if (!empty($output)) { $pub = file_get_contents($keyFile . '.pub'); $prv = file_get_contents($keyFile); @@ -56,16 +56,4 @@ class SshKey return $return; } - - /** - * Checks whether or not we can generate keys, by quietly test running ssh-keygen. - * @return bool - */ - public function canGenerateKeys() - { - $keygen = @shell_exec('ssh-keygen --help'); - $canGenerateKeys = !empty($keygen); - - return $canGenerateKeys; - } } From 601318b97b036f96d475f624ebcd3c204443773d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?A=CC=80lex=20Corretge=CC=81?= Date: Tue, 3 Feb 2015 13:19:33 +0100 Subject: [PATCH 125/329] Fix the problem when executing Phing out of the build dir. Closes #778 Closes #748 --- PHPCI/Plugin/Phing.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/PHPCI/Plugin/Phing.php b/PHPCI/Plugin/Phing.php index ae86968b..2bf64cca 100644 --- a/PHPCI/Plugin/Phing.php +++ b/PHPCI/Plugin/Phing.php @@ -213,8 +213,12 @@ class Phing implements \PHPCI\Plugin */ public function propertiesToString() { - if (empty($this->properties)) { - return ''; + /** + * fix the problem when execute phing out of the build dir + * @ticket 748 + */ + if (!isset($this->properties['project.basedir'])) { + $this->properties['project.basedir'] = $this->getDirectory(); } $propertiesString = array(); From 610a0e57efb3f2b4d230284e7db69413ebe3889b Mon Sep 17 00:00:00 2001 From: Daniel Seif Date: Wed, 28 Jan 2015 00:39:04 +0100 Subject: [PATCH 126/329] Fixed settings handling for symlink creation in local build Closes #766 --- PHPCI/Model/Build/LocalBuild.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/PHPCI/Model/Build/LocalBuild.php b/PHPCI/Model/Build/LocalBuild.php index b94ede4e..5131abe1 100644 --- a/PHPCI/Model/Build/LocalBuild.php +++ b/PHPCI/Model/Build/LocalBuild.php @@ -35,12 +35,14 @@ class LocalBuild extends Build return $this->handleConfig($builder, $buildPath) !== false; } - $buildSettings = $this->handleConfig($builder, $reference); + $configHandled = $this->handleConfig($builder, $reference); - if ($buildSettings === false) { + if ($configHandled === false) { return false; } + $buildSettings = $builder->getConfig('build_settings'); + if (isset($buildSettings['prefer_symlink']) && $buildSettings['prefer_symlink'] === true) { return $this->handleSymlink($builder, $reference, $buildPath); } else { From ea3109be6702be5cd645172d47a2192783b59978 Mon Sep 17 00:00:00 2001 From: Matthew Leffler Date: Mon, 12 Jan 2015 12:25:55 -0700 Subject: [PATCH 127/329] Convert tapString to UTF-8, allowing UTF8 output from PHPUnit, etc. Closes #738 --- PHPCI/Plugin/PhpUnit.php | 1 + 1 file changed, 1 insertion(+) diff --git a/PHPCI/Plugin/PhpUnit.php b/PHPCI/Plugin/PhpUnit.php index 3ea1ae8d..70e0e74f 100644 --- a/PHPCI/Plugin/PhpUnit.php +++ b/PHPCI/Plugin/PhpUnit.php @@ -162,6 +162,7 @@ class PhpUnit implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin } $tapString = $this->phpci->getLastOutput(); + $tapString = mb_convert_encoding($tapString, "UTF-8", "ISO-8859-1"); try { $tapParser = new TapParser($tapString); From 49056792980bab50cced463e2fcb5608457fe199 Mon Sep 17 00:00:00 2001 From: Adirelle Date: Thu, 8 Jan 2015 16:51:15 +0100 Subject: [PATCH 128/329] Email plugin: use "default_mailto_address" as a fallback only. Closes #730 --- PHPCI/Plugin/Email.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PHPCI/Plugin/Email.php b/PHPCI/Plugin/Email.php index 9e361d91..8414451f 100644 --- a/PHPCI/Plugin/Email.php +++ b/PHPCI/Plugin/Email.php @@ -159,10 +159,10 @@ class Email implements \PHPCI\Plugin } } - if (isset($this->options['default_mailto_address'])) { + if (empty($addresses) && isset($this->options['default_mailto_address'])) { $addresses[] = $this->options['default_mailto_address']; - return $addresses; } + return array_unique($addresses); } From 893deada33a9fcabe6f9aa255cb25f418d7ba72a Mon Sep 17 00:00:00 2001 From: nonlux Date: Mon, 23 Feb 2015 14:40:20 +0000 Subject: [PATCH 129/329] Set the CommandExecutor buildPath property when a build is created. Closes #556 --- PHPCI/Builder.php | 2 ++ PHPCI/Helper/BaseCommandExecutor.php | 13 ++++++++++--- PHPCI/Helper/CommandExecutor.php | 6 ++++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/PHPCI/Builder.php b/PHPCI/Builder.php index 904aa506..d911e04b 100644 --- a/PHPCI/Builder.php +++ b/PHPCI/Builder.php @@ -296,6 +296,8 @@ class Builder implements LoggerAwareInterface PHPCI_URL ); + $this->commandExecutor->setBuildPath($this->buildPath); + // Create a working copy of the project: if (!$this->build->createWorkingCopy($this, $this->buildPath)) { throw new \Exception(Lang::get('could_not_create_working')); diff --git a/PHPCI/Helper/BaseCommandExecutor.php b/PHPCI/Helper/BaseCommandExecutor.php index 28247ebc..4c2f1fa8 100644 --- a/PHPCI/Helper/BaseCommandExecutor.php +++ b/PHPCI/Helper/BaseCommandExecutor.php @@ -62,9 +62,7 @@ abstract class BaseCommandExecutor implements CommandExecutor $this->logger = $logger; $this->quiet = $quiet; $this->verbose = $verbose; - $this->lastOutput = array(); - $this->rootDir = $rootDir; } @@ -92,7 +90,7 @@ abstract class BaseCommandExecutor implements CommandExecutor $pipes = array(); - $process = proc_open($command, $descriptorSpec, $pipes, dirname($this->buildPath), null); + $process = proc_open($command, $descriptorSpec, $pipes, $this->buildPath, null); if (is_resource($process)) { fclose($pipes[0]); @@ -219,4 +217,13 @@ abstract class BaseCommandExecutor implements CommandExecutor } return null; } + + /** + * Set the buildPath property. + * @param string $path + */ + public function setBuildPath($path) + { + $this->buildPath = $path; + } } diff --git a/PHPCI/Helper/CommandExecutor.php b/PHPCI/Helper/CommandExecutor.php index d83f0c6b..bacd1a2e 100644 --- a/PHPCI/Helper/CommandExecutor.php +++ b/PHPCI/Helper/CommandExecutor.php @@ -30,4 +30,10 @@ interface CommandExecutor * @return null|string */ public function findBinary($binary, $buildPath = null); + + /** + * Set the buildPath property. + * @param string $path + */ + public function setBuildPath($path); } From e98647bd97d49741242d252514b8703504a62869 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 23 Feb 2015 15:58:14 +0000 Subject: [PATCH 130/329] Add support for Mercurial SSH-based clones. --- PHPCI/Model/Build/MercurialBuild.php | 75 +++++++++++++++++++++++----- 1 file changed, 63 insertions(+), 12 deletions(-) diff --git a/PHPCI/Model/Build/MercurialBuild.php b/PHPCI/Model/Build/MercurialBuild.php index 500b5372..0f38940b 100644 --- a/PHPCI/Model/Build/MercurialBuild.php +++ b/PHPCI/Model/Build/MercurialBuild.php @@ -13,36 +13,87 @@ use PHPCI\Model\Build; use PHPCI\Builder; /** -* Mercurial Build Model -* @author Pavel Gopanenko -* @package PHPCI -* @subpackage Core -*/ + * Mercurial Build Model + * @author Pavel Gopanenko + * @package PHPCI + * @subpackage Core + */ class MercurialBuild extends Build { /** - * Get the URL to be used to clone this remote repository. - */ + * Get the URL to be used to clone this remote repository. + */ protected function getCloneUrl() { return $this->getProject()->getReference(); } /** - * Create a working copy by cloning, copying, or similar. - */ + * Create a working copy by cloning, copying, or similar. + */ public function createWorkingCopy(Builder $builder, $buildPath) { - $this->cloneByHttp($builder, $buildPath); + $key = trim($this->getProject()->getSshPublicKey()); + + if (!empty($key) && strpos($this->getProject()->getReference(), 'ssh') > -1) { + $success = $this->cloneBySsh($builder, $buildPath); + } else { + $success = $this->cloneByHttp($builder, $buildPath); + } + + if (!$success) { + $builder->logFailure('Failed to clone remote git repository.'); + return false; + } return $this->handleConfig($builder, $buildPath); } /** - * Use an mercurial clone. - */ + * Use a HTTP-based Mercurial clone. + */ protected function cloneByHttp(Builder $builder, $cloneTo) { return $builder->executeCommand('hg clone %s "%s" -r %s', $this->getCloneUrl(), $cloneTo, $this->getBranch()); } + + /** + * Use an SSH-based Mercurial clone. + */ + protected function cloneBySsh(Builder $builder, $cloneTo) + { + $keyFile = $this->writeSshKey(); + + // Do the git clone: + $cmd = 'hg clone --ssh "ssh -i '.$keyFile.'" %s "%s"'; + $success = $builder->executeCommand($cmd, $this->getCloneUrl(), $cloneTo); + + if ($success) { + $success = $this->postCloneSetup($builder, $cloneTo); + } + + // Remove the key file: + unlink($keyFile); + return $success; + } + + /** + * Handle post-clone tasks (switching branch, etc.) + * @param Builder $builder + * @param $cloneTo + * @return bool + */ + protected function postCloneSetup(Builder $builder, $cloneTo) + { + $success = true; + $commit = $this->getCommitId(); + + // Allow switching to a specific branch: + if (!empty($commit) && $commit != 'Manual') { + $cmd = 'cd "%s" && hg checkout %s'; + $success = $builder->executeCommand($cmd, $cloneTo, $this->getBranch()); + } + + return $success; + } } From 1466ad06ef708cbab2b53112fc59e8c1d70c2e33 Mon Sep 17 00:00:00 2001 From: Alex Davyskiba Date: Sat, 31 Jan 2015 11:50:57 +0200 Subject: [PATCH 131/329] Allow projects to be archived. Closes #771 --- PHPCI/Application.php | 8 +++- PHPCI/Controller/HomeController.php | 8 +++- PHPCI/Controller/ProjectController.php | 7 ++++ PHPCI/Languages/lang.da.php | 1 + PHPCI/Languages/lang.de.php | 1 + PHPCI/Languages/lang.el.php | 1 + PHPCI/Languages/lang.en.php | 1 + PHPCI/Languages/lang.fr.php | 1 + PHPCI/Languages/lang.it.php | 1 + PHPCI/Languages/lang.nl.php | 1 + PHPCI/Languages/lang.pl.php | 1 + PHPCI/Languages/lang.ru.php | 1 + PHPCI/Languages/lang.uk.php | 1 + .../20150131075425_archive_project.php | 26 +++++++++++++ PHPCI/Model/Base/ProjectBase.php | 39 +++++++++++++++++++ PHPCI/Service/ProjectService.php | 4 ++ PHPCI/View/layout.phtml | 8 +++- 17 files changed, 107 insertions(+), 3 deletions(-) create mode 100644 PHPCI/Migrations/20150131075425_archive_project.php diff --git a/PHPCI/Application.php b/PHPCI/Application.php index ee1f6e15..8582fc41 100644 --- a/PHPCI/Application.php +++ b/PHPCI/Application.php @@ -137,7 +137,13 @@ class Application extends b8\Application { /** @var \PHPCI\Store\ProjectStore $projectStore */ $projectStore = b8\Store\Factory::getStore('Project'); - $layout->projects = $projectStore->getAll(); + $layout->projects = $projectStore->getWhere( + array('archived' => (int)isset($_GET['archived'])), + 50, + 0, + array(), + array('title' => 'ASC') + ); } /** diff --git a/PHPCI/Controller/HomeController.php b/PHPCI/Controller/HomeController.php index 65abf79a..2455e709 100644 --- a/PHPCI/Controller/HomeController.php +++ b/PHPCI/Controller/HomeController.php @@ -48,7 +48,13 @@ class HomeController extends \PHPCI\Controller { $this->layout->title = Lang::get('dashboard'); - $projects = $this->projectStore->getWhere(array(), 50, 0, array(), array('title' => 'ASC')); + $projects = $this->projectStore->getWhere( + array('archived' => (int)isset($_GET['archived'])), + 50, + 0, + array(), + array('title' => 'ASC') + ); $builds = $this->buildStore->getLatestBuilds(null, 10); diff --git a/PHPCI/Controller/ProjectController.php b/PHPCI/Controller/ProjectController.php index f2f63b26..285982a1 100644 --- a/PHPCI/Controller/ProjectController.php +++ b/PHPCI/Controller/ProjectController.php @@ -282,6 +282,7 @@ class ProjectController extends PHPCI\Controller 'ssh_public_key' => $this->getParam('pubkey', null), 'build_config' => $this->getParam('build_config', null), 'allow_public_status' => $this->getParam('allow_public_status', 0), + 'archived' => $this->getParam('archived', 0), 'branch' => $this->getParam('branch', null), ); @@ -357,6 +358,12 @@ class ProjectController extends PHPCI\Controller $field->setValue(0); $form->addField($field); + $field = Form\Element\Checkbox::create('archived', Lang::get('archived'), false); + $field->setContainerClass('form-group'); + $field->setCheckedValue(1); + $field->setValue(0); + $form->addField($field); + $field = new Form\Element\Submit(); $field->setValue(Lang::get('save_project')); $field->setContainerClass('form-group'); diff --git a/PHPCI/Languages/lang.da.php b/PHPCI/Languages/lang.da.php index 5010f28e..5ba3d96f 100644 --- a/PHPCI/Languages/lang.da.php +++ b/PHPCI/Languages/lang.da.php @@ -112,6 +112,7 @@ i din foretrukne hosting-platform.', (hvis du ikke har mulighed for at tilføje en phpci.yml fil i projektets repository)', 'default_branch' => 'Default branch navn', 'allow_public_status' => 'Tillad offentlig status-side og -billede for dette projekt?', + 'archived' => 'Archived', 'save_project' => 'Gem Projekt', 'error_mercurial' => 'Mercurial repository-URL skal starte med http:// eller https://', diff --git a/PHPCI/Languages/lang.de.php b/PHPCI/Languages/lang.de.php index c40ef23d..bdcc1459 100644 --- a/PHPCI/Languages/lang.de.php +++ b/PHPCI/Languages/lang.de.php @@ -113,6 +113,7 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab (falls Sie Ihrem Projektrepository kein phpci.yml hinzufügen können)', 'default_branch' => 'Name des Standardbranches', 'allow_public_status' => 'Öffentliche Statusseite und -bild für dieses Projekt einschalten?', + 'archived' => 'Archived', 'save_project' => 'Projekt speichern', 'error_mercurial' => 'Mercurial Repository-URL muss mit http://, oder https:// beginnen', diff --git a/PHPCI/Languages/lang.el.php b/PHPCI/Languages/lang.el.php index c611a87d..82b3cf22 100644 --- a/PHPCI/Languages/lang.el.php +++ b/PHPCI/Languages/lang.el.php @@ -113,6 +113,7 @@ PHPCI', (αν δεν μπορείτε να προσθέσετε ένα αρχείο phpci.yml στο αποθετήριο έργων)', 'default_branch' => 'Προκαθορισμένο όνομα διακλάδωσης', 'allow_public_status' => 'Ενεργοποίηση της σελίδας δημόσιας κατάστασης και την εικόνα για το έργο αυτό;', + 'archived' => 'Archived', 'save_project' => 'Αποθήκευση έργου', 'error_mercurial' => 'Ο σύνδεσμος URL του ευμετάβλητου αποθετηρίου πρέπει να ξεκινάει με http:// ή https://', diff --git a/PHPCI/Languages/lang.en.php b/PHPCI/Languages/lang.en.php index ec2306e0..450be1ef 100644 --- a/PHPCI/Languages/lang.en.php +++ b/PHPCI/Languages/lang.en.php @@ -114,6 +114,7 @@ PHPCI', (if you cannot add a phpci.yml file in the project repository)', 'default_branch' => 'Default branch name', 'allow_public_status' => 'Enable public status page and image for this project?', + 'archived' => 'Archived', 'save_project' => 'Save Project', 'error_mercurial' => 'Mercurial repository URL must be start with http:// or https://', diff --git a/PHPCI/Languages/lang.fr.php b/PHPCI/Languages/lang.fr.php index 45cc3958..20410684 100644 --- a/PHPCI/Languages/lang.fr.php +++ b/PHPCI/Languages/lang.fr.php @@ -113,6 +113,7 @@ PHPCI', (si vous ne pouvez pas ajouter de fichier phpci.yml à la racine du dépôt)', 'default_branch' => 'Nom de la branche par défaut', 'allow_public_status' => 'Activer la page de statut publique et l\'image pour ce projet ?', + 'archived' => 'Archived', 'save_project' => 'Enregistrer le projet', 'error_mercurial' => 'Les URLs de dépôt Mercurial doivent commencer par http:// ou https://', diff --git a/PHPCI/Languages/lang.it.php b/PHPCI/Languages/lang.it.php index c5c4e01b..46ca14fd 100644 --- a/PHPCI/Languages/lang.it.php +++ b/PHPCI/Languages/lang.it.php @@ -113,6 +113,7 @@ PHPCI', 'default_branch' => 'Nome del branch di default', 'allow_public_status' => 'Vuoi rendere pubblica la pagina dello stato e l\'immagine per questo progetto?', 'save_project' => 'Salva il Progetto', + 'archived' => 'Archived', 'error_mercurial' => 'L\'URL del repository Mercurial URL deve iniziare con http:// o https://', 'error_remote' => 'L\'URL del repository deve iniziare con git://, http:// o https://', diff --git a/PHPCI/Languages/lang.nl.php b/PHPCI/Languages/lang.nl.php index f38272c4..83d5e317 100644 --- a/PHPCI/Languages/lang.nl.php +++ b/PHPCI/Languages/lang.nl.php @@ -113,6 +113,7 @@ van je gekozen source code hosting platform', (indien je geen phpci.yml bestand aan de project repository kan toevoegen)', 'default_branch' => 'Standaard branch naam', 'allow_public_status' => 'Publieke statuspagina en afbeelding beschikbaar maken voor dit project?', + 'archived' => 'Archived', 'save_project' => 'Project opslaan', 'error_mercurial' => 'Mercurial repository URL dient te starten met http:// of https://', diff --git a/PHPCI/Languages/lang.pl.php b/PHPCI/Languages/lang.pl.php index 5bf5e043..9d6de6c8 100644 --- a/PHPCI/Languages/lang.pl.php +++ b/PHPCI/Languages/lang.pl.php @@ -114,6 +114,7 @@ od wybranego kodu źródłowego platformy hostingowej.', (jeśli nie możesz dodać pliku phpci.yml do repozytorium projektu)', 'default_branch' => 'Domyślna nazwa gałęzi', 'allow_public_status' => 'Włączyć status publiczny dla tego projektu?', + 'archived' => 'Archived', 'save_project' => 'Zachowaj Projekt', 'error_mercurial' => 'URL repozytorium Mercurialnego powinno zaczynać się od http:// and https://', diff --git a/PHPCI/Languages/lang.ru.php b/PHPCI/Languages/lang.ru.php index 836db6f4..2f9ab0ee 100644 --- a/PHPCI/Languages/lang.ru.php +++ b/PHPCI/Languages/lang.ru.php @@ -112,6 +112,7 @@ PHPCI', (если вы не добавили файл phpci.yml в репозиторий вашего проекта)', 'default_branch' => 'Ветка по умолчанию', 'allow_public_status' => 'Разрешить публичный статус и изображение (статуса) для проекта', + 'archived' => 'Archived', 'save_project' => 'Сохранить проект', 'error_mercurial' => 'URL репозитория Mercurial должен начинаться с http:// или https://', diff --git a/PHPCI/Languages/lang.uk.php b/PHPCI/Languages/lang.uk.php index f51bd885..7e4a2191 100644 --- a/PHPCI/Languages/lang.uk.php +++ b/PHPCI/Languages/lang.uk.php @@ -112,6 +112,7 @@ PHPCI', (якщо ви не додали файл phpci.yml до репозиторію вашого проекту)', 'default_branch' => 'Назва гілки за замовчуванням', 'allow_public_status' => 'Увімкнути публічну сторінку статусу та зображення для цього проекта?', + 'archived' => 'Archived', 'save_project' => 'Зберегти проект', 'error_mercurial' => 'URL репозиторію Mercurial повинен починатись із http:// або https://', diff --git a/PHPCI/Migrations/20150131075425_archive_project.php b/PHPCI/Migrations/20150131075425_archive_project.php new file mode 100644 index 00000000..796fd48b --- /dev/null +++ b/PHPCI/Migrations/20150131075425_archive_project.php @@ -0,0 +1,26 @@ +table('project'); + $project->addColumn('archived', 'boolean'); + $project->save(); + } + + /** + * Migrate Down. + */ + public function down() + { + $project = $this->table('project'); + $project->removeColumn('archived'); + $project->save(); + } +} \ No newline at end of file diff --git a/PHPCI/Model/Base/ProjectBase.php b/PHPCI/Model/Base/ProjectBase.php index 305cafbf..0ea77b78 100644 --- a/PHPCI/Model/Base/ProjectBase.php +++ b/PHPCI/Model/Base/ProjectBase.php @@ -44,6 +44,7 @@ class ProjectBase extends Model 'build_config' => null, 'ssh_public_key' => null, 'allow_public_status' => null, + 'archived' => null, ); /** @@ -62,6 +63,7 @@ class ProjectBase extends Model 'build_config' => 'getBuildConfig', 'ssh_public_key' => 'getSshPublicKey', 'allow_public_status' => 'getAllowPublicStatus', + 'archived' => 'getArchived', // Foreign key getters: ); @@ -82,6 +84,7 @@ class ProjectBase extends Model 'build_config' => 'setBuildConfig', 'ssh_public_key' => 'setSshPublicKey', 'allow_public_status' => 'setAllowPublicStatus', + 'archived' => 'setArchived', // Foreign key setters: ); @@ -148,6 +151,12 @@ class ProjectBase extends Model 'type' => 'int', 'length' => 11, ), + 'archived' => array( + 'type' => 'tinyint', + 'length' => 4, + 'nullable' => true, + 'default' => null, + ), ); /** @@ -296,6 +305,18 @@ class ProjectBase extends Model return $rtn; } + /** + * Get the value of Archived / archived. + * + * @return int + */ + public function getArchived() + { + $rtn = $this->data['archived']; + + return $rtn; + } + /** * Set the value of Id / id. * @@ -506,6 +527,24 @@ class ProjectBase extends Model $this->_setModified('allow_public_status'); } + /** + * Set the value of Archived / archived. + * + * @param $value int + */ + public function setArchived($value) + { + $this->_validateInt('Archived', $value); + + if ($this->data['archived'] === $value) { + return; + } + + $this->data['archived'] = $value; + + $this->_setModified('archived'); + } + /** * Get Build models by ProjectId for this Project. * diff --git a/PHPCI/Service/ProjectService.php b/PHPCI/Service/ProjectService.php index 22e940ac..c7ba787c 100644 --- a/PHPCI/Service/ProjectService.php +++ b/PHPCI/Service/ProjectService.php @@ -81,6 +81,10 @@ class ProjectService $project->setAllowPublicStatus((int)$options['allow_public_status']); } + if (array_key_exists('archived', $options)) { + $project->setArchived((bool)$options['archived']); + } + if (array_key_exists('branch', $options)) { $project->setBranch($options['branch']); } diff --git a/PHPCI/View/layout.phtml b/PHPCI/View/layout.phtml index 64ec0834..6c384a9e 100644 --- a/PHPCI/View/layout.phtml +++ b/PHPCI/View/layout.phtml @@ -147,7 +147,7 @@
    • - + User()->getIsAdmin()): ?>
  • @@ -242,6 +242,12 @@
    • +
  • + + + +
    • + From 1f0cd491427b361fd9489ae3fc2f35be43e8ebc4 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 23 Feb 2015 19:40:31 +0000 Subject: [PATCH 132/329] Adding changelog. --- changelog.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 changelog.md diff --git a/changelog.md b/changelog.md new file mode 100644 index 00000000..15fd9560 --- /dev/null +++ b/changelog.md @@ -0,0 +1,10 @@ +# PHPCI Changelog + +## v.Next + +### New Features: +- SSH-based Mercurial clones. +- Ability to archive projects. + +### Bug Fixes and Tweaks: + From fba6f2372fffa9cca66afb08e1f5573453042146 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Mon, 23 Feb 2015 19:45:33 +0000 Subject: [PATCH 133/329] Updating changelog. --- changelog.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog.md b/changelog.md index 15fd9560..541e4a13 100644 --- a/changelog.md +++ b/changelog.md @@ -3,8 +3,8 @@ ## v.Next ### New Features: -- SSH-based Mercurial clones. -- Ability to archive projects. +- SSH-based Mercurial clones (Commit: [e98647bd](https://github.com/Block8/PHPCI/commit/e98647bd97d49741242d252514b8703504a62869), PR: [#812](https://github.com/Block8/PHPCI/pull/812)) +- Ability to archive projects (Commit: [1466ad06](https://github.com/Block8/PHPCI/commit/1466ad06ef708cbab2b53112fc59e8c1d70c2e33), PR: [#771](https://github.com/Block8/PHPCI/pull/771)) ### Bug Fixes and Tweaks: From f4a0804100a1a94bc7175e98cddc38735daff1d6 Mon Sep 17 00:00:00 2001 From: zviryatko Date: Tue, 24 Feb 2015 10:01:36 +0200 Subject: [PATCH 134/329] Fix username style in user panel block. --- PHPCI/View/layout.phtml | 2 +- public/assets/css/AdminLTE-custom.css | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/PHPCI/View/layout.phtml b/PHPCI/View/layout.phtml index 6c384a9e..569772c1 100644 --- a/PHPCI/View/layout.phtml +++ b/PHPCI/View/layout.phtml @@ -134,7 +134,7 @@
    <?php print $this->User()->getName(); ?>
    -
    +

    User()->getName()); ?>

    diff --git a/public/assets/css/AdminLTE-custom.css b/public/assets/css/AdminLTE-custom.css index a0fb3dd7..b95f7b70 100644 --- a/public/assets/css/AdminLTE-custom.css +++ b/public/assets/css/AdminLTE-custom.css @@ -74,4 +74,14 @@ margin-left: 1px; margin-top: 19px; font-size: 11px; +} + +.user-panel > .image { + padding-right: 15px; +} + +.user-panel > .info { + padding: 0; + font-size: inherit; + line-height: inherit; } \ No newline at end of file From db90f2ea11a76d70e5805c1cab7ddba54a97bd3c Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 25 Feb 2015 09:36:50 +0000 Subject: [PATCH 135/329] Updating the UpdateCommand to check for a config key rather than a specific file. --- PHPCI/Command/UpdateCommand.php | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/PHPCI/Command/UpdateCommand.php b/PHPCI/Command/UpdateCommand.php index 8170675a..13e31f79 100644 --- a/PHPCI/Command/UpdateCommand.php +++ b/PHPCI/Command/UpdateCommand.php @@ -9,6 +9,7 @@ namespace PHPCI\Command; +use b8\Config; use Monolog\Logger; use PHPCI\Helper\Lang; use Symfony\Component\Console\Command\Command; @@ -59,19 +60,9 @@ class UpdateCommand extends Command protected function verifyInstalled(OutputInterface $output) { - if (!file_exists(PHPCI_DIR . 'PHPCI/config.yml')) { - $output->writeln(''.Lang::get('not_installed').''); - $output->writeln(''.Lang::get('install_instead').''); - return false; - } + $config = Config::getInstance(); + $phpciUrl = $config->get('phpci.url'); - $content = file_get_contents(PHPCI_DIR . 'PHPCI/config.yml'); - if (empty($content)) { - $output->writeln(''.Lang::get('not_installed').''); - $output->writeln(''.Lang::get('install_instead').''); - return false; - } - - return true; + return !empty($phpciUrl); } } From 18ff21174e56874c91cdef02cc62e3c675062e5a Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 25 Feb 2015 10:33:11 +0000 Subject: [PATCH 136/329] Fixing dates: Stop all dates from appearing as the current date/time. Fixes #820 --- public/assets/js/phpci.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/public/assets/js/phpci.js b/public/assets/js/phpci.js index a2d5954c..0d262235 100644 --- a/public/assets/js/phpci.js +++ b/public/assets/js/phpci.js @@ -9,8 +9,9 @@ var PHPCI = { $(document).ready(function () { // Format datetimes $('time[datetime]').each(function() { - var $this = $(this); - $this.text(moment(this.dateTime).format($this.data('format') || 'lll')); + var thisDate = $(this).attr('datetime'); + var formattedDate = moment(thisDate).format($(this).data('format') || 'lll'); + $(this).text(formattedDate); }); // Update latest builds every 5 seconds: From e423c73c4e0bbe87e1bf1d4506335be23b900662 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 25 Feb 2015 14:13:28 +0000 Subject: [PATCH 137/329] Fixing comparison where commit ID is Manual. Fixes #823 --- PHPCI/Model/Build/GithubBuild.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/PHPCI/Model/Build/GithubBuild.php b/PHPCI/Model/Build/GithubBuild.php index 7c8f3f6f..1482f1c0 100644 --- a/PHPCI/Model/Build/GithubBuild.php +++ b/PHPCI/Model/Build/GithubBuild.php @@ -209,7 +209,9 @@ class GithubBuild extends RemoteGitBuild if (!empty($prNumber)) { $builder->executeCommand('cd %s && git diff origin/%s "%s"', $path, $this->getBranch(), $file); } else { - $builder->executeCommand('cd %s && git diff %s^! "%s"', $path, $this->getCommitId(), $file); + $commitId = $this->getCommitId(); + $compare = $commitId == 'Manual' ? 'HEAD' : $commitId; + $builder->executeCommand('cd %s && git diff %s^! "%s"', $path, $compare, $file); } $builder->logExecOutput(true); From 8ab098821b048bc09ef616aae5554f8345d15055 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 25 Feb 2015 14:18:05 +0000 Subject: [PATCH 138/329] Updating Settings Controller to use the configured config file, rather than assuming config.yml --- PHPCI/Controller/SettingsController.php | 7 ++++--- bootstrap.php | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/PHPCI/Controller/SettingsController.php b/PHPCI/Controller/SettingsController.php index 3c5ab5f4..a13c9fd4 100644 --- a/PHPCI/Controller/SettingsController.php +++ b/PHPCI/Controller/SettingsController.php @@ -40,7 +40,7 @@ class SettingsController extends Controller parent::init(); $parser = new Parser(); - $yaml = file_get_contents(APPLICATION_PATH . 'PHPCI/config.yml'); + $yaml = file_get_contents(PHPCI_CONFIG_FILE); $this->settings = $parser->parse($yaml); } @@ -76,6 +76,7 @@ class SettingsController extends Controller $authSettings = $this->settings['phpci']['authentication_settings']; } + $this->view->configFile = PHPCI_CONFIG_FILE; $this->view->basicSettings = $this->getBasicForm($basicSettings); $this->view->buildSettings = $this->getBuildForm($buildSettings); $this->view->github = $this->getGithubForm(); @@ -241,7 +242,7 @@ class SettingsController extends Controller { $dumper = new Dumper(); $yaml = $dumper->dump($this->settings, 4); - file_put_contents(APPLICATION_PATH . 'PHPCI/config.yml', $yaml); + file_put_contents(PHPCI_CONFIG_FILE, $yaml); if (error_get_last()) { $error_get_last = error_get_last(); @@ -386,7 +387,7 @@ class SettingsController extends Controller */ protected function canWriteConfig() { - return is_writeable(APPLICATION_PATH . 'PHPCI/config.yml'); + return is_writeable(PHPCI_CONFIG_FILE); } /** diff --git a/bootstrap.php b/bootstrap.php index b15a7e59..252697a8 100644 --- a/bootstrap.php +++ b/bootstrap.php @@ -25,6 +25,8 @@ if (!empty($configEnv)) { $configFile = $configEnv; } +define('PHPCI_CONFIG_FILE', $configFile); + // If we don't have a config file at all, fail at this point and tell the user to install: if (!file_exists($configFile) && (!defined('PHPCI_IS_CONSOLE') || !PHPCI_IS_CONSOLE)) { $message = 'PHPCI has not yet been installed - Please use the command "./console phpci:install" '; From 4a84aad327c1c8b2ac2731d5d72617025bd8ac3a Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 26 Feb 2015 08:08:12 +0000 Subject: [PATCH 139/329] Updating basic Dockerfile. --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index af646d09..5fb6df83 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,4 +15,7 @@ RUN git config --global user.email "hello@php.ci" ADD ./ /phpci +RUN php -r "readfile('https://getcomposer.org/installer');" | php +RUN mv composer.phar /phpci/composer + CMD /phpci/daemonise phpci:daemonise From bfc56a753d9ac3669dfe74df79c2867f0436ec26 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 26 Feb 2015 08:08:45 +0000 Subject: [PATCH 140/329] Updating dependencies. --- composer.json | 2 +- composer.lock | 55 ++++++++++++++++++++++----------------------------- 2 files changed, 25 insertions(+), 32 deletions(-) diff --git a/composer.json b/composer.json index 0e5a308b..2eec5e30 100644 --- a/composer.json +++ b/composer.json @@ -47,7 +47,7 @@ "phpunit/phpunit": "~4.0", "phpspec/prophecy-phpunit": "~1.0", "phpmd/phpmd": "~2.0", - "squizlabs/php_codesniffer": "~1.5", + "squizlabs/php_codesniffer": "~2.0", "block8/php-docblock-checker": "~1.0", "phploc/phploc": "~2.0" }, diff --git a/composer.lock b/composer.lock index 4ec183ff..c5abc102 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "b24b68e21f65f3de2b7c3c84a67a0e6f", + "hash": "4ae188c6be1c1388de6271a3b0e0475d", "packages": [ { "name": "block8/b8framework", @@ -255,16 +255,16 @@ }, { "name": "robmorgan/phinx", - "version": "v0.4.2.1", + "version": "v0.4.3", "source": { "type": "git", "url": "https://github.com/robmorgan/phinx.git", - "reference": "1bc1396392d4073b8b29ee5289e445889cbc12b5" + "reference": "0d1f9cb9939f65f506a8a3f5fee356764c310fd4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/robmorgan/phinx/zipball/1bc1396392d4073b8b29ee5289e445889cbc12b5", - "reference": "1bc1396392d4073b8b29ee5289e445889cbc12b5", + "url": "https://api.github.com/repos/robmorgan/phinx/zipball/0d1f9cb9939f65f506a8a3f5fee356764c310fd4", + "reference": "0d1f9cb9939f65f506a8a3f5fee356764c310fd4", "shasum": "" }, "require": { @@ -313,7 +313,7 @@ "migrations", "phinx" ], - "time": "2015-02-08 03:41:44" + "time": "2015-02-23 16:38:12" }, { "name": "swiftmailer/swiftmailer", @@ -935,21 +935,21 @@ }, { "name": "phpspec/prophecy-phpunit", - "version": "v1.0.1", - "target-dir": "Prophecy/PhpUnit", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy-phpunit.git", - "reference": "640c8c3bc9e02d7878e5ed22b1f79818d6bb6caf" + "reference": "0d06c84b9f26aab2b9940354f0fe6037dd9799c3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy-phpunit/zipball/640c8c3bc9e02d7878e5ed22b1f79818d6bb6caf", - "reference": "640c8c3bc9e02d7878e5ed22b1f79818d6bb6caf", + "url": "https://api.github.com/repos/phpspec/prophecy-phpunit/zipball/0d06c84b9f26aab2b9940354f0fe6037dd9799c3", + "reference": "0d06c84b9f26aab2b9940354f0fe6037dd9799c3", "shasum": "" }, "require": { - "phpspec/prophecy": "~1.0" + "php": ">=5.3.3", + "phpspec/prophecy": "~1.3" }, "suggest": { "phpunit/phpunit": "if it is not installed globally" @@ -961,7 +961,7 @@ } }, "autoload": { - "psr-0": { + "psr-4": { "Prophecy\\PhpUnit\\": "" } }, @@ -976,12 +976,12 @@ } ], "description": "PhpUnit test case integrating the Prophecy mocking library", - "homepage": "http://phpspec.org", + "homepage": "http://phpspec.net", "keywords": [ "phpunit", "prophecy" ], - "time": "2014-03-03 23:03:12" + "time": "2015-02-09 11:20:26" }, { "name": "phpunit/php-code-coverage", @@ -1812,46 +1812,39 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "1.5.6", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "6f3e42d311b882b25b4d409d23a289f4d3b803d5" + "reference": "b301c98f19414d836fdaa678648745fcca5aeb4f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/6f3e42d311b882b25b4d409d23a289f4d3b803d5", - "reference": "6f3e42d311b882b25b4d409d23a289f4d3b803d5", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/b301c98f19414d836fdaa678648745fcca5aeb4f", + "reference": "b301c98f19414d836fdaa678648745fcca5aeb4f", "shasum": "" }, "require": { "ext-tokenizer": "*", "php": ">=5.1.2" }, - "suggest": { - "phpunit/php-timer": "dev-master" - }, "bin": [ - "scripts/phpcs" + "scripts/phpcs", + "scripts/phpcbf" ], "type": "library", - "extra": { - "branch-alias": { - "dev-phpcs-fixer": "2.0.x-dev" - } - }, "autoload": { "classmap": [ "CodeSniffer.php", "CodeSniffer/CLI.php", "CodeSniffer/Exception.php", "CodeSniffer/File.php", + "CodeSniffer/Fixer.php", "CodeSniffer/Report.php", "CodeSniffer/Reporting.php", "CodeSniffer/Sniff.php", "CodeSniffer/Tokens.php", "CodeSniffer/Reports/", - "CodeSniffer/CommentParser/", "CodeSniffer/Tokenizers/", "CodeSniffer/DocGenerators/", "CodeSniffer/Standards/AbstractPatternSniff.php", @@ -1877,13 +1870,13 @@ "role": "lead" } ], - "description": "PHP_CodeSniffer tokenises PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", + "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", "homepage": "http://www.squizlabs.com/php-codesniffer", "keywords": [ "phpcs", "standards" ], - "time": "2014-12-04 22:32:15" + "time": "2015-01-21 22:44:05" }, { "name": "symfony/dependency-injection", From ab4396e00d5a47c360fbf5cbe7ac0f5cc98d92d6 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 26 Feb 2015 08:31:58 +0000 Subject: [PATCH 141/329] Hopefully fixing a bug where reporting errors back to Github causes an infinite loop. --- PHPCI/Helper/Diff.php | 6 +++++- PHPCI/Model/Build/GithubBuild.php | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/PHPCI/Helper/Diff.php b/PHPCI/Helper/Diff.php index e50c7eaf..5dcb5388 100644 --- a/PHPCI/Helper/Diff.php +++ b/PHPCI/Helper/Diff.php @@ -26,11 +26,15 @@ class Diff */ public function getLinePositions($diff) { + if (empty($diff)) { + return null; + } + $rtn = array(); $diffLines = explode(PHP_EOL, $diff); - while (1) { + while (count($diffLines)) { $line = array_shift($diffLines); if (substr($line, 0, 2) == '@@') { diff --git a/PHPCI/Model/Build/GithubBuild.php b/PHPCI/Model/Build/GithubBuild.php index 1482f1c0..4d61b9d6 100644 --- a/PHPCI/Model/Build/GithubBuild.php +++ b/PHPCI/Model/Build/GithubBuild.php @@ -211,7 +211,7 @@ class GithubBuild extends RemoteGitBuild } else { $commitId = $this->getCommitId(); $compare = $commitId == 'Manual' ? 'HEAD' : $commitId; - $builder->executeCommand('cd %s && git diff %s^! "%s"', $path, $compare, $file); + $builder->executeCommand('cd %s && git diff %s^^ "%s"', $path, $compare, $file); } $builder->logExecOutput(true); From 86b9c05f98e3fa740565e2d45884afecd29eae24 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 26 Feb 2015 08:45:42 +0000 Subject: [PATCH 142/329] Fixing PHPCS errors. --- PHPCI/Controller/PluginController.php | 2 +- PHPCI/Controller/WebhookController.php | 6 ++---- PHPCI/Helper/BaseCommandExecutor.php | 1 - PHPCI/Helper/Github.php | 6 ------ PHPCI/Helper/LoginIsDisabled.php | 2 +- PHPCI/Logging/Handler.php | 2 -- PHPCI/Plugin/Phar.php | 1 - PHPCI/Plugin/PhpTalLint.php | 1 - PHPCI/Plugin/Util/Executor.php | 2 -- PHPCI/Plugin/Util/FilesPluginInformation.php | 2 +- bootstrap.php | 8 ++------ vars.php | 6 ++++++ 12 files changed, 13 insertions(+), 26 deletions(-) diff --git a/PHPCI/Controller/PluginController.php b/PHPCI/Controller/PluginController.php index 20675e46..cefcdbb5 100644 --- a/PHPCI/Controller/PluginController.php +++ b/PHPCI/Controller/PluginController.php @@ -126,7 +126,7 @@ class PluginController extends \PHPCI\Controller /** * Convert array to json and save composer.json - * + * * @param $array */ protected function setComposerJson($array) diff --git a/PHPCI/Controller/WebhookController.php b/PHPCI/Controller/WebhookController.php index cef7dc53..619eec16 100644 --- a/PHPCI/Controller/WebhookController.php +++ b/PHPCI/Controller/WebhookController.php @@ -157,6 +157,8 @@ class WebhookController extends \PHPCI\Controller * Handle the payload when Github sends a commit webhook. * @param $project * @param array $payload + * @param b8\Http\Response\JsonResponse $response + * @return b8\Http\Response\JsonResponse */ protected function githubCommitRequest($project, array $payload, b8\Http\Response\JsonResponse $response) { @@ -167,7 +169,6 @@ class WebhookController extends \PHPCI\Controller } try { - if (isset($payload['commits']) && is_array($payload['commits'])) { // If we have a list of commits, then add them all as builds to be tested: @@ -265,13 +266,10 @@ class WebhookController extends \PHPCI\Controller $payload = json_decode($payloadString, true); try { - - // build on merge request events if (isset($payload['object_kind']) && $payload['object_kind'] == 'merge_request') { $attributes = $payload['object_attributes']; if ($attributes['state'] == 'opened' || $attributes['state'] == 'reopened') { - $branch = $attributes['source_branch']; $commit = $attributes['last_commit']; $committer = $commit['author']['email']; diff --git a/PHPCI/Helper/BaseCommandExecutor.php b/PHPCI/Helper/BaseCommandExecutor.php index 4c2f1fa8..5435d597 100644 --- a/PHPCI/Helper/BaseCommandExecutor.php +++ b/PHPCI/Helper/BaseCommandExecutor.php @@ -160,7 +160,6 @@ abstract class BaseCommandExecutor implements CommandExecutor $this->logger->log(Lang::get('looking_for_binary', $bin), LogLevel::DEBUG); if (is_dir($composerBin) && is_file($composerBin.'/'.$bin)) { - $this->logger->log(Lang::get('found_in_path', $composerBin, $bin), LogLevel::DEBUG); $binaryPath = $composerBin . '/' . $bin; break; diff --git a/PHPCI/Helper/Github.php b/PHPCI/Helper/Github.php index 00d959df..67173eb4 100644 --- a/PHPCI/Helper/Github.php +++ b/PHPCI/Helper/Github.php @@ -48,24 +48,18 @@ class Github $res = $http->get($url, $params); foreach ($res['body'] as $item) { - $results[] = $item; - } foreach ($res['headers'] as $header) { - if (preg_match('/^Link: <([^>]+)>; rel="next"/', $header, $r)) { - $host = parse_url($r[1]); parse_str($host['query'], $params); $results = $this->makeRecursiveRequest($host['path'], $params, $results); break; - } - } return $results; diff --git a/PHPCI/Helper/LoginIsDisabled.php b/PHPCI/Helper/LoginIsDisabled.php index d30fcd9f..437b95cd 100644 --- a/PHPCI/Helper/LoginIsDisabled.php +++ b/PHPCI/Helper/LoginIsDisabled.php @@ -20,7 +20,7 @@ use b8\Config; class LoginIsDisabled { /** - * Checks if + * Checks if * @param $method * @param array $params * @return mixed|null diff --git a/PHPCI/Logging/Handler.php b/PHPCI/Logging/Handler.php index ebfa2620..e22351da 100644 --- a/PHPCI/Logging/Handler.php +++ b/PHPCI/Logging/Handler.php @@ -70,7 +70,6 @@ class Handler public function handleError($level, $message, $file, $line) { if (error_reporting() & $level) { - $exception_level = isset($this->levels[$level]) ? $this->levels[$level] : $level; throw new \ErrorException( @@ -140,7 +139,6 @@ class Handler protected function log(\Exception $exception) { if (null !== $this->logger) { - $message = sprintf( '%s: %s (uncaught exception) at %s line %s', get_class($exception), diff --git a/PHPCI/Plugin/Phar.php b/PHPCI/Plugin/Phar.php index f04580e7..0500fddc 100644 --- a/PHPCI/Plugin/Phar.php +++ b/PHPCI/Plugin/Phar.php @@ -227,7 +227,6 @@ class Phar implements \PHPCI\Plugin $success = false; try { - $phar = new PHPPhar($this->getDirectory() . '/' . $this->getFilename(), 0, $this->getFilename()); $phar->buildFromDirectory($this->getPHPCI()->buildPath, $this->getRegExp()); diff --git a/PHPCI/Plugin/PhpTalLint.php b/PHPCI/Plugin/PhpTalLint.php index 146b0479..e12b6c34 100644 --- a/PHPCI/Plugin/PhpTalLint.php +++ b/PHPCI/Plugin/PhpTalLint.php @@ -210,7 +210,6 @@ class PhpTalLint implements PHPCI\Plugin $output = $this->phpci->getLastOutput(); if (preg_match('/Found (.+?) (error|warning)/i', $output, $matches)) { - $rows = explode(PHP_EOL, $output); unset($rows[0]); diff --git a/PHPCI/Plugin/Util/Executor.php b/PHPCI/Plugin/Util/Executor.php index 9482c81f..8c74707e 100644 --- a/PHPCI/Plugin/Util/Executor.php +++ b/PHPCI/Plugin/Util/Executor.php @@ -50,10 +50,8 @@ class Executor // Try and execute it: if ($this->executePlugin($plugin, $options)) { - // Execution was successful: $this->logger->logSuccess(Lang::get('plugin_success')); - } elseif ($stage == 'setup') { // If we're in the "setup" stage, execution should not continue after // a plugin has failed: diff --git a/PHPCI/Plugin/Util/FilesPluginInformation.php b/PHPCI/Plugin/Util/FilesPluginInformation.php index 2593ae22..d5ccebd5 100644 --- a/PHPCI/Plugin/Util/FilesPluginInformation.php +++ b/PHPCI/Plugin/Util/FilesPluginInformation.php @@ -69,7 +69,7 @@ class FilesPluginInformation implements InstalledPluginInformation { return array_map( function (\stdClass $plugin) { - return $plugin->class; + return $plugin->class; }, $this->getInstalledPlugins() ); diff --git a/bootstrap.php b/bootstrap.php index 252697a8..e3f9985e 100644 --- a/bootstrap.php +++ b/bootstrap.php @@ -16,17 +16,13 @@ if (empty($timezone)) { date_default_timezone_set('UTC'); } -// If the PHPCI config file is not where we expect it, try looking in -// env for an alternative config path. $configFile = dirname(__FILE__) . '/PHPCI/config.yml'; - $configEnv = getenv('phpci_config_file'); -if (!empty($configEnv)) { + +if (!empty($configEnv) && file_exists($configEnv)) { $configFile = $configEnv; } -define('PHPCI_CONFIG_FILE', $configFile); - // If we don't have a config file at all, fail at this point and tell the user to install: if (!file_exists($configFile) && (!defined('PHPCI_IS_CONSOLE') || !PHPCI_IS_CONSOLE)) { $message = 'PHPCI has not yet been installed - Please use the command "./console phpci:install" '; diff --git a/vars.php b/vars.php index 2408d41d..aed6b6f8 100644 --- a/vars.php +++ b/vars.php @@ -29,3 +29,9 @@ if (!defined('PHPCI_IS_CONSOLE')) { if (!defined('IS_WIN')) { define('IS_WIN', ((strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') ? true : false)); } + +// If an environment variable is set defining our config location, use that +// otherwise fall back to PHPCI/config.yml. +if (!defined('PHPCI_CONFIG_FILE')) { + define('PHPCI_CONFIG_FILE', $configFile); +} \ No newline at end of file From b8983b23a30b66058be1927c9848f8c851785f05 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Thu, 26 Feb 2015 08:48:40 +0000 Subject: [PATCH 143/329] Fixing final PHPCS error. --- vars.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars.php b/vars.php index aed6b6f8..b622ab31 100644 --- a/vars.php +++ b/vars.php @@ -34,4 +34,4 @@ if (!defined('IS_WIN')) { // otherwise fall back to PHPCI/config.yml. if (!defined('PHPCI_CONFIG_FILE')) { define('PHPCI_CONFIG_FILE', $configFile); -} \ No newline at end of file +} From da9be4930dee9607dc661cf65bc4f451903322c6 Mon Sep 17 00:00:00 2001 From: corpsee Date: Sat, 28 Feb 2015 23:13:02 +0600 Subject: [PATCH 144/329] Added total builds count to index and project page --- PHPCI/Controller/HomeController.php | 15 ++++++++++----- PHPCI/Controller/ProjectController.php | 2 +- PHPCI/View/Project/view.phtml | 3 +-- PHPCI/View/SummaryTable.phtml | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/PHPCI/Controller/HomeController.php b/PHPCI/Controller/HomeController.php index 2455e709..8b57db58 100644 --- a/PHPCI/Controller/HomeController.php +++ b/PHPCI/Controller/HomeController.php @@ -98,12 +98,16 @@ class HomeController extends \PHPCI\Controller protected function getSummaryHtml($projects) { $summaryBuilds = array(); - $successes = array(); - $failures = array(); + $successes = array(); + $failures = array(); + $counts = array(); foreach ($projects['items'] as $project) { $summaryBuilds[$project->getId()] = $this->buildStore->getLatestBuilds($project->getId()); + $count = $this->buildStore->getWhere(array('project_id' => $project->getId()), 1, 0, array(), array('id' => 'DESC')); + $counts[$project->getId()] = $count['count']; + $success = $this->buildStore->getLastBuildByStatus($project->getId(), Build::STATUS_SUCCESS); $failure = $this->buildStore->getLastBuildByStatus($project->getId(), Build::STATUS_FAILED); @@ -112,10 +116,11 @@ class HomeController extends \PHPCI\Controller } $summaryView = new b8\View('SummaryTable'); - $summaryView->projects = $projects['items']; - $summaryView->builds = $summaryBuilds; + $summaryView->projects = $projects['items']; + $summaryView->builds = $summaryBuilds; $summaryView->successful = $successes; - $summaryView->failed = $failures; + $summaryView->failed = $failures; + $summaryView->counts = $counts; return $summaryView->render(); } diff --git a/PHPCI/Controller/ProjectController.php b/PHPCI/Controller/ProjectController.php index 285982a1..3a55f49b 100644 --- a/PHPCI/Controller/ProjectController.php +++ b/PHPCI/Controller/ProjectController.php @@ -86,7 +86,7 @@ class ProjectController extends PHPCI\Controller $this->view->builds = $builds[0]; $this->view->total = $builds[1]; $this->view->project = $project; - $this->view->branch = urldecode($branch); + $this->view->branch = urldecode($branch); $this->view->branches = $this->projectStore->getKnownBranches($projectId); $this->view->page = $page; $this->view->pages = $pages; diff --git a/PHPCI/View/Project/view.phtml b/PHPCI/View/Project/view.phtml index 0bfd5e59..900349c8 100644 --- a/PHPCI/View/Project/view.phtml +++ b/PHPCI/View/Project/view.phtml @@ -36,8 +36,7 @@
    - -

    +

    ()

    diff --git a/PHPCI/View/SummaryTable.phtml b/PHPCI/View/SummaryTable.phtml index 56df6e38..9ddaabb0 100644 --- a/PHPCI/View/SummaryTable.phtml +++ b/PHPCI/View/SummaryTable.phtml @@ -123,7 +123,7 @@ foreach($projects as $project): - + (getId()]; ?>) From 9f534711866112429c84494f3d6fb5b5ebb4bc10 Mon Sep 17 00:00:00 2001 From: corpsee Date: Sat, 28 Feb 2015 23:38:56 +0600 Subject: [PATCH 145/329] Added Date column for builds table in project page. --- PHPCI/Languages/lang.da.php | 1 + PHPCI/Languages/lang.de.php | 1 + PHPCI/Languages/lang.el.php | 1 + PHPCI/Languages/lang.en.php | 1 + PHPCI/Languages/lang.fr.php | 1 + PHPCI/Languages/lang.it.php | 1 + PHPCI/Languages/lang.nl.php | 1 + PHPCI/Languages/lang.pl.php | 1 + PHPCI/Languages/lang.ru.php | 1 + PHPCI/Languages/lang.uk.php | 1 + PHPCI/View/BuildsTable.phtml | 1 + PHPCI/View/Project/view.phtml | 1 + 12 files changed, 12 insertions(+) diff --git a/PHPCI/Languages/lang.da.php b/PHPCI/Languages/lang.da.php index 5ba3d96f..fdf27bc6 100644 --- a/PHPCI/Languages/lang.da.php +++ b/PHPCI/Languages/lang.da.php @@ -126,6 +126,7 @@ i din foretrukne hosting-platform.', 'all_branches' => 'Alle branches', 'builds' => 'Builds', 'id' => 'ID', + 'date' => 'Date', 'project' => 'Projekt', 'commit' => 'Commit', 'branch' => 'Branch', diff --git a/PHPCI/Languages/lang.de.php b/PHPCI/Languages/lang.de.php index bdcc1459..a4b83580 100644 --- a/PHPCI/Languages/lang.de.php +++ b/PHPCI/Languages/lang.de.php @@ -127,6 +127,7 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab 'all_branches' => 'Alle Branches', 'builds' => 'Builds', 'id' => 'ID', + 'date' => 'Date', 'project' => 'Projekt', 'commit' => 'Commit', 'branch' => 'Branch', diff --git a/PHPCI/Languages/lang.el.php b/PHPCI/Languages/lang.el.php index 82b3cf22..bf5649fb 100644 --- a/PHPCI/Languages/lang.el.php +++ b/PHPCI/Languages/lang.el.php @@ -127,6 +127,7 @@ PHPCI', 'all_branches' => 'Όλες οι διακλαδώσεις', 'builds' => 'Κατασκευές', 'id' => 'Αριθμός αναγνώρισης', + 'date' => 'Date', 'project' => 'Έργο', 'commit' => 'Συνεισφορά', 'branch' => 'Διακλάδωση', diff --git a/PHPCI/Languages/lang.en.php b/PHPCI/Languages/lang.en.php index 450be1ef..1e4ffa32 100644 --- a/PHPCI/Languages/lang.en.php +++ b/PHPCI/Languages/lang.en.php @@ -128,6 +128,7 @@ PHPCI', 'all_branches' => 'All Branches', 'builds' => 'Builds', 'id' => 'ID', + 'date' => 'Date', 'project' => 'Project', 'commit' => 'Commit', 'branch' => 'Branch', diff --git a/PHPCI/Languages/lang.fr.php b/PHPCI/Languages/lang.fr.php index 20410684..77e0d0ab 100644 --- a/PHPCI/Languages/lang.fr.php +++ b/PHPCI/Languages/lang.fr.php @@ -127,6 +127,7 @@ PHPCI', 'all_branches' => 'Toutes les branches', 'builds' => 'Builds', 'id' => 'ID', + 'date' => 'Date', 'project' => 'Projet', 'commit' => 'Commit', 'branch' => 'Branche', diff --git a/PHPCI/Languages/lang.it.php b/PHPCI/Languages/lang.it.php index 46ca14fd..50b59040 100644 --- a/PHPCI/Languages/lang.it.php +++ b/PHPCI/Languages/lang.it.php @@ -127,6 +127,7 @@ PHPCI', 'all_branches' => 'Tutti i Branche', 'builds' => 'Builds', 'id' => 'ID', + 'date' => 'Date', 'project' => 'Progetto', 'commit' => 'Commit', 'branch' => 'Branch', diff --git a/PHPCI/Languages/lang.nl.php b/PHPCI/Languages/lang.nl.php index 83d5e317..d62cd4e5 100644 --- a/PHPCI/Languages/lang.nl.php +++ b/PHPCI/Languages/lang.nl.php @@ -127,6 +127,7 @@ van je gekozen source code hosting platform', 'all_branches' => 'Alle brances', 'builds' => 'Builds', 'id' => 'ID', + 'date' => 'Date', 'project' => 'Project', 'commit' => 'Commit', 'branch' => 'Branch', diff --git a/PHPCI/Languages/lang.pl.php b/PHPCI/Languages/lang.pl.php index 9d6de6c8..640ac4e0 100644 --- a/PHPCI/Languages/lang.pl.php +++ b/PHPCI/Languages/lang.pl.php @@ -128,6 +128,7 @@ od wybranego kodu źródłowego platformy hostingowej.', 'all_branches' => 'Wszystkie Gałęzie', 'builds' => 'Budowania', 'id' => 'ID', + 'date' => 'Date', 'project' => 'Projekt', 'commit' => 'Commit', 'branch' => 'Gałąź', diff --git a/PHPCI/Languages/lang.ru.php b/PHPCI/Languages/lang.ru.php index 2f9ab0ee..dba0d934 100644 --- a/PHPCI/Languages/lang.ru.php +++ b/PHPCI/Languages/lang.ru.php @@ -126,6 +126,7 @@ PHPCI', 'all_branches' => 'Все ветки', 'builds' => 'Сборки', 'id' => 'ID', + 'date' => 'Дата', 'project' => 'Проект', 'commit' => 'Коммит', 'branch' => 'Ветка', diff --git a/PHPCI/Languages/lang.uk.php b/PHPCI/Languages/lang.uk.php index 7e4a2191..0fd6d66a 100644 --- a/PHPCI/Languages/lang.uk.php +++ b/PHPCI/Languages/lang.uk.php @@ -126,6 +126,7 @@ PHPCI', 'all_branches' => 'Усі гілки', 'builds' => 'Збірки', 'id' => 'ID', + 'date' => 'Дата', 'project' => 'Проект', 'commit' => 'Комміт', 'branch' => 'Гілка', diff --git a/PHPCI/View/BuildsTable.phtml b/PHPCI/View/BuildsTable.phtml index c9d44930..93ea593b 100644 --- a/PHPCI/View/BuildsTable.phtml +++ b/PHPCI/View/BuildsTable.phtml @@ -39,6 +39,7 @@ switch($build->getStatus()) ?> + + From 000aff9121c7dbeeae9cdd5f217cfd4bf5e8fcd3 Mon Sep 17 00:00:00 2001 From: corpsee Date: Sat, 28 Feb 2015 23:51:04 +0600 Subject: [PATCH 146/329] Code style fix --- PHPCI/Controller/HomeController.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/PHPCI/Controller/HomeController.php b/PHPCI/Controller/HomeController.php index 8b57db58..d0e5a14b 100644 --- a/PHPCI/Controller/HomeController.php +++ b/PHPCI/Controller/HomeController.php @@ -105,7 +105,13 @@ class HomeController extends \PHPCI\Controller foreach ($projects['items'] as $project) { $summaryBuilds[$project->getId()] = $this->buildStore->getLatestBuilds($project->getId()); - $count = $this->buildStore->getWhere(array('project_id' => $project->getId()), 1, 0, array(), array('id' => 'DESC')); + $count = $this->buildStore->getWhere( + array('project_id' => $project->getId()), + 1, + 0, + array(), + array('id' => 'DESC') + ); $counts[$project->getId()] = $count['count']; $success = $this->buildStore->getLastBuildByStatus($project->getId(), Build::STATUS_SUCCESS); From f97089529c332a83a314fefc1d9daf58407b5be4 Mon Sep 17 00:00:00 2001 From: corpsee Date: Mon, 2 Mar 2015 08:18:40 +0600 Subject: [PATCH 147/329] Fixed 'date' it lang string --- PHPCI/Languages/lang.it.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Languages/lang.it.php b/PHPCI/Languages/lang.it.php index 50b59040..b022068c 100644 --- a/PHPCI/Languages/lang.it.php +++ b/PHPCI/Languages/lang.it.php @@ -127,7 +127,7 @@ PHPCI', 'all_branches' => 'Tutti i Branche', 'builds' => 'Builds', 'id' => 'ID', - 'date' => 'Date', + 'date' => 'Data', 'project' => 'Progetto', 'commit' => 'Commit', 'branch' => 'Branch', From d2e6182a2ff847035b86d2e9d46184fa907563bf Mon Sep 17 00:00:00 2001 From: Mark Clements Date: Mon, 2 Mar 2015 22:31:01 +0000 Subject: [PATCH 148/329] Fixed an inconsistency in the way the prompts in the install scripts were being output. All the DB/host fields have a space after the colon, which is much better as it means the text you type is slightly separated from the prompt. However, the admin user fields didn't include this space which was inconsistent and made the install script a little less professional. I have therefore added the missing space for the prompts which didn't have it in the English language file, and have also updated all other language files to also use this format. Most of them followed the same inconsistency as the English version, though some were consistent but without a space, and some which were differently inconsistent (both internally, and between languages). --- PHPCI/Languages/lang.da.php | 16 ++++++++-------- PHPCI/Languages/lang.de.php | 6 +++--- PHPCI/Languages/lang.el.php | 12 ++++++------ PHPCI/Languages/lang.en.php | 6 +++--- PHPCI/Languages/lang.fr.php | 6 +++--- PHPCI/Languages/lang.it.php | 6 +++--- PHPCI/Languages/lang.nl.php | 16 ++++++++-------- PHPCI/Languages/lang.pl.php | 16 ++++++++-------- PHPCI/Languages/lang.ru.php | 6 +++--- PHPCI/Languages/lang.uk.php | 16 ++++++++-------- 10 files changed, 53 insertions(+), 53 deletions(-) diff --git a/PHPCI/Languages/lang.da.php b/PHPCI/Languages/lang.da.php index 5ba3d96f..3f8f2f38 100644 --- a/PHPCI/Languages/lang.da.php +++ b/PHPCI/Languages/lang.da.php @@ -296,15 +296,15 @@ du kører composer update.', Kontrollér venligst nedenstående fejl før du fortsætter.', 'must_be_valid_email' => 'Skal være en gyldig email-adresse.', 'must_be_valid_url' => 'Skal være en gyldig URL.', - 'enter_name' => 'Administrator-navn:', - 'enter_email' => 'Administrators email-adresse:', - 'enter_password' => 'Administrator-adgangskode:', - 'enter_phpci_url' => 'Din PHPCI URL (eksempelvis "http://phpci.local"):', + 'enter_name' => 'Administrator-navn: ', + 'enter_email' => 'Administrators email-adresse: ', + 'enter_password' => 'Administrator-adgangskode: ', + 'enter_phpci_url' => 'Din PHPCI URL (eksempelvis "http://phpci.local"): ', - 'enter_db_host' => 'Indtast dit MySQL-hostnavn [localhost]:', - 'enter_db_name' => 'Indtast dit MySQL database-navn [phpci]:', - 'enter_db_user' => 'Indtast dit MySQL-brugernavn [phpci]:', - 'enter_db_pass' => 'Indtast dit MySQL-password:', + 'enter_db_host' => 'Indtast dit MySQL-hostnavn [localhost]: ', + 'enter_db_name' => 'Indtast dit MySQL database-navn [phpci]: ', + 'enter_db_user' => 'Indtast dit MySQL-brugernavn [phpci]: ', + 'enter_db_pass' => 'Indtast dit MySQL-password: ', 'could_not_connect' => 'PHPCI kunne ikke forbinde til MySQL med de angivning oplysninger. Forsøg igen.', 'setting_up_db' => 'Indlæser database...', 'user_created' => 'Brugerkonto oprettet!', diff --git a/PHPCI/Languages/lang.de.php b/PHPCI/Languages/lang.de.php index bdcc1459..6a8bd5c4 100644 --- a/PHPCI/Languages/lang.de.php +++ b/PHPCI/Languages/lang.de.php @@ -294,9 +294,9 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab Bitte überprüfen Sie die Fehler, bevor Sie fortfahren,', 'must_be_valid_email' => 'Muss eine gültige Emailadresse sein.', 'must_be_valid_url' => 'Muss eine valide URL sein.', - 'enter_name' => 'Name des Administrators:', - 'enter_email' => 'Emailadresse des Administrators:', - 'enter_password' => 'Passwort des Administrators:', + 'enter_name' => 'Name des Administrators: ', + 'enter_email' => 'Emailadresse des Administrators: ', + 'enter_password' => 'Passwort des Administrators: ', 'enter_phpci_url' => 'Ihre PHPCI-URL (z.B. "http://phpci.local"): ', 'enter_db_host' => 'Bitte geben Sie Ihren MySQL-Host ein [localhost]: ', diff --git a/PHPCI/Languages/lang.el.php b/PHPCI/Languages/lang.el.php index 82b3cf22..e3503c99 100644 --- a/PHPCI/Languages/lang.el.php +++ b/PHPCI/Languages/lang.el.php @@ -297,15 +297,15 @@ Services του Bitbucket αποθετηρίου σας.', Παρακαλούμε διαβάστε τα παραπάνω λάθη πριν συνεχίσετε.', 'must_be_valid_email' => 'Πρέπει να είναι μια έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου.', 'must_be_valid_url' => 'Πρέπει να είναι μια έγκυρη διεύθυνση URL.', - 'enter_name' => 'Όνομα διαχειριστή:', - 'enter_email' => 'Ηλ. Διεύθυνση διαχειριστή:', - 'enter_password' => 'Κωδικός πρόσβασης διαχειριστή:', + 'enter_name' => 'Όνομα διαχειριστή: ', + 'enter_email' => 'Ηλ. Διεύθυνση διαχειριστή: ', + 'enter_password' => 'Κωδικός πρόσβασης διαχειριστή: ', 'enter_phpci_url' => 'Ο URL σύνδεσμος σας για το PHPCI ("http://phpci.local" για παράδειγμα): ', - 'enter_db_host' => 'Παρακαλώ εισάγετε τον MySQL οικοδεσπότη σας [localhost]:', + 'enter_db_host' => 'Παρακαλώ εισάγετε τον MySQL οικοδεσπότη σας [localhost]: ', 'enter_db_name' => 'Παρακαλώ εισάγετε το όνομα της MySQL βάσης δεδομένων σας [phpci]: ', - 'enter_db_user' => 'Παρακαλώ εισάγετε το όνομα χρήστη της MySQL σας [phpci]:', - 'enter_db_pass' => 'Παρακαλώ εισάγετε τον κωδικό χρήστη της MySQL σας:', + 'enter_db_user' => 'Παρακαλώ εισάγετε το όνομα χρήστη της MySQL σας [phpci]: ', + 'enter_db_pass' => 'Παρακαλώ εισάγετε τον κωδικό χρήστη της MySQL σας: ', 'could_not_connect' => 'Το PHPCI δεν μπόρεσε να συνδεθεί με την MySQL με τα στοχεία που δώσατε. Παρακαλώ δοκιμάστε ξανά.', 'setting_up_db' => 'Γίνεται ρύθμιση της βάσης δεδομένων σας ...', 'user_created' => 'Λογαριασμός χρήστη δημιουργήθηκε!', diff --git a/PHPCI/Languages/lang.en.php b/PHPCI/Languages/lang.en.php index 450be1ef..2040986d 100644 --- a/PHPCI/Languages/lang.en.php +++ b/PHPCI/Languages/lang.en.php @@ -301,9 +301,9 @@ PHPCI', Please review the errors above before continuing.', 'must_be_valid_email' => 'Must be a valid email address.', 'must_be_valid_url' => 'Must be a valid URL.', - 'enter_name' => 'Admin Name:', - 'enter_email' => 'Admin Email:', - 'enter_password' => 'Admin Password:', + 'enter_name' => 'Admin Name: ', + 'enter_email' => 'Admin Email: ', + 'enter_password' => 'Admin Password: ', 'enter_phpci_url' => 'Your PHPCI URL ("http://phpci.local" for example): ', 'enter_db_host' => 'Please enter your MySQL host [localhost]: ', diff --git a/PHPCI/Languages/lang.fr.php b/PHPCI/Languages/lang.fr.php index 20410684..7d438d2f 100644 --- a/PHPCI/Languages/lang.fr.php +++ b/PHPCI/Languages/lang.fr.php @@ -298,9 +298,9 @@ PHPCI', Merci de corriger les erreurs ci-dessus avant de continuer.', 'must_be_valid_email' => 'Doit être une adresse email valide.', 'must_be_valid_url' => 'Doit être une URL valide.', - 'enter_name' => 'Nom de l\'admin :', - 'enter_email' => 'Email de l\'admin :', - 'enter_password' => 'Mot de passe de l\'admin :', + 'enter_name' => 'Nom de l\'admin: ', + 'enter_email' => 'Email de l\'admin: ', + 'enter_password' => 'Mot de passe de l\'admin: ', 'enter_phpci_url' => 'Votre URL vers PHPCI (par exemple "http://phpci.local"): ', 'enter_db_host' => 'Merci d\'entrer le nom d\'hôte MySQL [localhost]: ', diff --git a/PHPCI/Languages/lang.it.php b/PHPCI/Languages/lang.it.php index 46ca14fd..ea023454 100644 --- a/PHPCI/Languages/lang.it.php +++ b/PHPCI/Languages/lang.it.php @@ -300,9 +300,9 @@ PHPCI', Per favore controlla gli errori riportati prima di proseguire.', 'must_be_valid_email' => 'Deve essere un indirizzo email valido.', 'must_be_valid_url' => 'Deve essere un URL valido.', - 'enter_name' => 'Nome dell\'amministratore:', - 'enter_email' => 'Email dell\'amministratore:', - 'enter_password' => 'Password dell\'amministratore:', + 'enter_name' => 'Nome dell\'amministratore: ', + 'enter_email' => 'Email dell\'amministratore: ', + 'enter_password' => 'Password dell\'amministratore: ', 'enter_phpci_url' => 'L\'URL di PHPCI ("http://phpci.locale" ad esempio): ', 'enter_db_host' => 'Per favore inserisci l\'host MySQL [localhost]: ', diff --git a/PHPCI/Languages/lang.nl.php b/PHPCI/Languages/lang.nl.php index 83d5e317..f118e5b3 100644 --- a/PHPCI/Languages/lang.nl.php +++ b/PHPCI/Languages/lang.nl.php @@ -298,15 +298,15 @@ keer je composer update uitvoert.', Gelieve de fouten na te kijken vooraleer verder te gaan.', 'must_be_valid_email' => 'Moet een geldig e-mailadres zijn.', 'must_be_valid_url' => 'Moet een geldige URL zijn.', - 'enter_name' => 'Administrator naam:', - 'enter_email' => 'Administrator e-mailadres:', - 'enter_password' => 'Administrator wachtwoord:', - 'enter_phpci_url' => 'Je PHPCI URL (bijvoorbeeld "http://phpci.local")', + 'enter_name' => 'Administrator naam: ', + 'enter_email' => 'Administrator e-mailadres: ', + 'enter_password' => 'Administrator wachtwoord: ', + 'enter_phpci_url' => 'Je PHPCI URL (bijvoorbeeld "http://phpci.local"): ', - 'enter_db_host' => 'Vul je MySQL host in [localhost]:', - 'enter_db_name' => 'Vul je MySQL databasenaam in [phpci]:', - 'enter_db_user' => 'Vul je MySQL gebruikersnaam in [phpci]:', - 'enter_db_pass' => 'Vul je MySQL watchtwoord in:', + 'enter_db_host' => 'Vul je MySQL host in [localhost]: ', + 'enter_db_name' => 'Vul je MySQL databasenaam in [phpci]: ', + 'enter_db_user' => 'Vul je MySQL gebruikersnaam in [phpci]: ', + 'enter_db_pass' => 'Vul je MySQL watchtwoord in: ', 'could_not_connect' => 'PHPCI kon met deze gegevens geen verbinding maken met MySQL. Gelieve opnieuw te proberen.', 'setting_up_db' => 'Database wordt aangemaakt...', 'user_created' => 'Gebruikersprofiel aangemaakt!', diff --git a/PHPCI/Languages/lang.pl.php b/PHPCI/Languages/lang.pl.php index 9d6de6c8..c3291d1d 100644 --- a/PHPCI/Languages/lang.pl.php +++ b/PHPCI/Languages/lang.pl.php @@ -299,15 +299,15 @@ wywołaniu polecenia composer update.', Przejrzyj powyższą listę błędów przed kontynuowaniem.', 'must_be_valid_email' => 'Poprawny adres email jest wymagany.', 'must_be_valid_url' => 'Poprawny URL jest wymagany.', - 'enter_name' => 'Imię Admina:', - 'enter_email' => 'Email Admina:', - 'enter_password' => 'Hasło Admina:', - 'enter_phpci_url' => 'URL PHPCI (na przykład "http://phpci.local"):', + 'enter_name' => 'Imię Admina: ', + 'enter_email' => 'Email Admina: ', + 'enter_password' => 'Hasło Admina: ', + 'enter_phpci_url' => 'URL PHPCI (na przykład "http://phpci.local"): ', - 'enter_db_host' => 'Wpisz hosta MySQL [host lokalny]:', - 'enter_db_name' => 'Wpisz nazwę bazy danych MySQL [phpci]:', - 'enter_db_user' => 'Wpisz nazwę użytkownika MySQL [phpci]:', - 'enter_db_pass' => 'Wpisz hasło MySQL:', + 'enter_db_host' => 'Wpisz hosta MySQL [host lokalny]: ', + 'enter_db_name' => 'Wpisz nazwę bazy danych MySQL [phpci]: ', + 'enter_db_user' => 'Wpisz nazwę użytkownika MySQL [phpci]: ', + 'enter_db_pass' => 'Wpisz hasło MySQL: ', 'could_not_connect' => 'Z podanymi ustawieniami PHPCI nie udało się połączyć z MySQL. Spróbuj ponownie.', 'setting_up_db' => 'Ustawianie Twojej bazy danych...', 'user_created' => 'Utworzono konto użytkownika!', diff --git a/PHPCI/Languages/lang.ru.php b/PHPCI/Languages/lang.ru.php index 2f9ab0ee..422f17e1 100644 --- a/PHPCI/Languages/lang.ru.php +++ b/PHPCI/Languages/lang.ru.php @@ -294,9 +294,9 @@ PHPCI', Пожалуйста, просмотрите возникшие ошибки перед тем, как продолжить.', 'must_be_valid_email' => 'Должен быть корректным email-адресом.', 'must_be_valid_url' => 'Должен быть корректным URL-адресом.', - 'enter_name' => 'Имя администратора:', - 'enter_email' => 'Email администратора:', - 'enter_password' => 'Пароль администратора:', + 'enter_name' => 'Имя администратора: ', + 'enter_email' => 'Email администратора: ', + 'enter_password' => 'Пароль администратора: ', 'enter_phpci_url' => 'URL-адрес вашего PHPCI (например: "http://phpci.local"): ', 'enter_db_host' => 'Пожалуйста, введите хост MySQL [localhost]: ', diff --git a/PHPCI/Languages/lang.uk.php b/PHPCI/Languages/lang.uk.php index 7e4a2191..118fae9e 100644 --- a/PHPCI/Languages/lang.uk.php +++ b/PHPCI/Languages/lang.uk.php @@ -298,15 +298,15 @@ PHPCI', Будь ласка, продивіться наявні помилки перед тим, як продовжити.', 'must_be_valid_email' => 'Повинно бути коректною email адресою.', 'must_be_valid_url' => 'Повинно бути коректним URL.', - 'enter_name' => 'Ім’я адміністратора:', - 'enter_email' => 'Email адміністратора:', - 'enter_password' => 'Пароль адміністратора:', - 'enter_phpci_url' => 'URL адреса вашого PHPCI (наприклад, "http://phpci.local"):', + 'enter_name' => 'Ім’я адміністратора: ', + 'enter_email' => 'Email адміністратора: ', + 'enter_password' => 'Пароль адміністратора: ', + 'enter_phpci_url' => 'URL адреса вашого PHPCI (наприклад, "http://phpci.local"): ', - 'enter_db_host' => 'Будь ласка, введіть хост MySQL [localhost]:', - 'enter_db_name' => 'Будь ласка, введить ім’я бази даних MySQL [phpci]:', - 'enter_db_user' => 'Будь ласка, введить ім’я користувача MySQL [phpci]:', - 'enter_db_pass' => 'Будь ласка, введить ваш пароль MySQL:', + 'enter_db_host' => 'Будь ласка, введіть хост MySQL [localhost]: ', + 'enter_db_name' => 'Будь ласка, введить ім’я бази даних MySQL [phpci]: ', + 'enter_db_user' => 'Будь ласка, введить ім’я користувача MySQL [phpci]: ', + 'enter_db_pass' => 'Будь ласка, введить ваш пароль MySQL: ', 'could_not_connect' => 'PHPCI не може підключитися до MySQL із наданими параметрами. Будь ласка, спробуйте ще раз.', 'setting_up_db' => 'Налаштування вашої бази даних...', 'user_created' => 'Аккаунт користувача створено!', From 8a96ec85517caac25864a03306b1efb9d027a882 Mon Sep 17 00:00:00 2001 From: Mark Clements Date: Mon, 2 Mar 2015 22:49:22 +0000 Subject: [PATCH 149/329] Fixed the install script, which bails-out with an error if the PHPCI path contains spaces. This occurs commonly on Windows, but from my reading of the code it would also be a problem on other platforms if spaces were present (though this is less likely, due to different naming conventions). It has been fixed by using escapeshellarg() on both of the paths used in the command. Fixes #698, which I've just noticed has a similar solution suggested in one of the comments, but was closed without anyone actually implementing it. --- PHPCI/Command/InstallCommand.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/PHPCI/Command/InstallCommand.php b/PHPCI/Command/InstallCommand.php index 04e0f2dd..a50eefec 100644 --- a/PHPCI/Command/InstallCommand.php +++ b/PHPCI/Command/InstallCommand.php @@ -323,7 +323,9 @@ class InstallCommand extends Command { $output->write(Lang::get('setting_up_db')); - shell_exec(PHPCI_DIR . 'vendor/bin/phinx migrate -c "' . PHPCI_DIR . 'phinx.php"'); + $phinxBinary = escapeshellarg(PHPCI_DIR . 'vendor/bin/phinx'); + $phinxScript = escapeshellarg(PHPCI_DIR . 'phinx.php'); + shell_exec($phinxBinary . ' migrate -c ' . $phinxScript); $output->writeln(''.Lang::get('ok').''); } From 610d0991a86e6c65bfb9276153070a1e117633b8 Mon Sep 17 00:00:00 2001 From: Nathan Jovin Date: Thu, 5 Mar 2015 00:12:42 -0800 Subject: [PATCH 150/329] Fix issue #840 Technical Debt not storing data nor displaying results in table --- PHPCI/Plugin/TechnicalDebt.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/PHPCI/Plugin/TechnicalDebt.php b/PHPCI/Plugin/TechnicalDebt.php index afe6c920..4d38ec59 100755 --- a/PHPCI/Plugin/TechnicalDebt.php +++ b/PHPCI/Plugin/TechnicalDebt.php @@ -207,5 +207,7 @@ class TechnicalDebt implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin } } } + + return array( $errorCount, $data ); } } From 542d2a35457cc2ebfd12771eeeac875256b9166a Mon Sep 17 00:00:00 2001 From: Thomas Frei Date: Fri, 6 Mar 2015 17:44:22 +0100 Subject: [PATCH 151/329] Remove short array syntax to keep backwards compatibility with php5.3 --- PHPCI/Application.php | 2 +- PHPCI/Controller/SettingsController.php | 6 +++--- PHPCI/Plugin/TechnicalDebt.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/PHPCI/Application.php b/PHPCI/Application.php index 8582fc41..8dcdf76d 100644 --- a/PHPCI/Application.php +++ b/PHPCI/Application.php @@ -51,7 +51,7 @@ class Application extends b8\Application return false; }; - $skipAuth = [$this, 'shouldSkipAuth']; + $skipAuth = array($this, 'shouldSkipAuth'); // Handler for the route we're about to register, checks for a valid session where necessary: $routeHandler = function (&$route, Response &$response) use (&$request, $validateSession, $skipAuth) { diff --git a/PHPCI/Controller/SettingsController.php b/PHPCI/Controller/SettingsController.php index a13c9fd4..aaaa637f 100644 --- a/PHPCI/Controller/SettingsController.php +++ b/PHPCI/Controller/SettingsController.php @@ -351,7 +351,7 @@ class SettingsController extends Controller $form->addField($field); $field = new Form\Element\Select('smtp_encryption'); - $field->setOptions(['' => Lang::get('none'), 'tls' => Lang::get('tls'), 'ssl' => Lang::get('ssl')]); + $field->setOptions(array('' => Lang::get('none'), 'tls' => Lang::get('tls'), 'ssl' => Lang::get('ssl'))); $field->setRequired(false); $field->setLabel(Lang::get('use_smtp_encryption')); $field->setContainerClass('form-group'); @@ -406,13 +406,13 @@ class SettingsController extends Controller $field->setLabel(Lang::get('failed_after')); $field->setClass('form-control'); $field->setContainerClass('form-group'); - $field->setOptions([ + $field->setOptions(array( 300 => Lang::get('5_mins'), 900 => Lang::get('15_mins'), 1800 => Lang::get('30_mins'), 3600 => Lang::get('1_hour'), 10800 => Lang::get('3_hours'), - ]); + )); $field->setValue(1800); $form->addField($field); diff --git a/PHPCI/Plugin/TechnicalDebt.php b/PHPCI/Plugin/TechnicalDebt.php index 4d38ec59..eca05213 100755 --- a/PHPCI/Plugin/TechnicalDebt.php +++ b/PHPCI/Plugin/TechnicalDebt.php @@ -152,7 +152,7 @@ class TechnicalDebt implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin { $dirIterator = new \RecursiveDirectoryIterator($this->directory); $iterator = new \RecursiveIteratorIterator($dirIterator, \RecursiveIteratorIterator::SELF_FIRST); - $files = []; + $files = array(); $ignores = $this->ignore; $ignores[] = 'phpci.yml'; @@ -207,7 +207,7 @@ class TechnicalDebt implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin } } } - + return array( $errorCount, $data ); } } From a7b40ce176617156acc1348cba6fe19414cb4658 Mon Sep 17 00:00:00 2001 From: Leszek Date: Sat, 7 Mar 2015 13:26:12 +0000 Subject: [PATCH 152/329] archived --- PHPCI/Languages/lang.pl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Languages/lang.pl.php b/PHPCI/Languages/lang.pl.php index 9d6de6c8..7b2d8cc7 100644 --- a/PHPCI/Languages/lang.pl.php +++ b/PHPCI/Languages/lang.pl.php @@ -114,7 +114,7 @@ od wybranego kodu źródłowego platformy hostingowej.', (jeśli nie możesz dodać pliku phpci.yml do repozytorium projektu)', 'default_branch' => 'Domyślna nazwa gałęzi', 'allow_public_status' => 'Włączyć status publiczny dla tego projektu?', - 'archived' => 'Archived', + 'archived' => 'W archiwum', 'save_project' => 'Zachowaj Projekt', 'error_mercurial' => 'URL repozytorium Mercurialnego powinno zaczynać się od http:// and https://', From 942127ffe6e8132b5d03123206ab049dab112d8f Mon Sep 17 00:00:00 2001 From: corpsee Date: Fri, 27 Feb 2015 15:56:05 +0600 Subject: [PATCH 153/329] Added default value in profile language select (current language) --- PHPCI/Controller/UserController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/PHPCI/Controller/UserController.php b/PHPCI/Controller/UserController.php index 8d09ecd0..19a7313f 100644 --- a/PHPCI/Controller/UserController.php +++ b/PHPCI/Controller/UserController.php @@ -123,6 +123,7 @@ class UserController extends Controller $lang->setLabel(Lang::get('language')); $lang->setRequired(true); $lang->setOptions(Lang::getLanguageOptions()); + $lang->setValue(Lang::getLanguage()); $form->addField($lang); $submit = new Form\Element\Submit(); From 00b88630fbb4762f3bd32cc856e2238abffba5b9 Mon Sep 17 00:00:00 2001 From: Adirelle Date: Thu, 26 Feb 2015 15:20:44 +0100 Subject: [PATCH 154/329] Display a green border in passing build notifications. --- PHPCI/View/Email/success.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/View/Email/success.phtml b/PHPCI/View/Email/success.phtml index a6dfccea..a3a604c5 100644 --- a/PHPCI/View/Email/success.phtml +++ b/PHPCI/View/Email/success.phtml @@ -1,4 +1,4 @@ -
    +
    getTitle(); ?> - Build #getId(); ?> From 4e8dc7c87b89f541a1753c2d107f5a039fb0661a Mon Sep 17 00:00:00 2001 From: Igor Timoshenko Date: Wed, 25 Feb 2015 16:05:30 +0000 Subject: [PATCH 155/329] Fixed typos in Ukrainian language --- PHPCI/Languages/lang.uk.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/PHPCI/Languages/lang.uk.php b/PHPCI/Languages/lang.uk.php index 7e4a2191..f7ac8627 100644 --- a/PHPCI/Languages/lang.uk.php +++ b/PHPCI/Languages/lang.uk.php @@ -8,7 +8,7 @@ */ $strings = array( - 'language_name' => 'Український', + 'language_name' => 'Українська', 'language' => 'Мова', // Log in: @@ -20,10 +20,10 @@ $strings = array( і вам буде надіслано листа із посиланням на скидання паролю.', 'reset_email_address' => 'Введіть свою email адресу:', 'reset_send_email' => 'Скидання пароля', - 'reset_enter_password' => 'Введіть будь-ласка новий пароль', + 'reset_enter_password' => 'Введіть, будь ласка, новий пароль', 'reset_new_password' => 'Новий пароль:', 'reset_change_password' => 'Змінити пароль', - 'reset_no_user_exists' => 'Не існує користувача з такою email адресою, будь-ласка повторіть знову.', + 'reset_no_user_exists' => 'Не існує користувача з такою email адресою, будь ласка, повторіть знову.', 'reset_email_body' => 'Привіт, %s, Ви отримали цей лист, тому що ви або хтось інший запросили скидання пароля в PHPCI. @@ -62,7 +62,7 @@ PHPCI', 'manage_users' => 'Управління користувачами', 'plugins' => 'Плагіни', 'view' => 'Переглянути', - 'build_now' => 'Збірати', + 'build_now' => 'Зібрати', 'edit_project' => 'Редагувати проект', 'delete_project' => 'Видалити проект', @@ -186,7 +186,7 @@ PHPCI', 'phpunit' => 'PHP Unit', 'file' => 'Файл', - 'line' => 'Строка', + 'line' => 'Рядок', 'class' => 'Клас', 'method' => 'Метод', 'message' => 'Повідомлення', From e75ffe0b763d152438c493ee11341c3c360e45c2 Mon Sep 17 00:00:00 2001 From: corpsee Date: Tue, 10 Mar 2015 15:44:33 +0600 Subject: [PATCH 156/329] Fixed 'date' nl lang string --- PHPCI/Languages/lang.nl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Languages/lang.nl.php b/PHPCI/Languages/lang.nl.php index d62cd4e5..a4c95b6d 100644 --- a/PHPCI/Languages/lang.nl.php +++ b/PHPCI/Languages/lang.nl.php @@ -127,7 +127,7 @@ van je gekozen source code hosting platform', 'all_branches' => 'Alle brances', 'builds' => 'Builds', 'id' => 'ID', - 'date' => 'Date', + 'date' => 'Datum', 'project' => 'Project', 'commit' => 'Commit', 'branch' => 'Branch', From 33fc50a0b55b69289b343560eabf32150600d525 Mon Sep 17 00:00:00 2001 From: Gustavo Novaro Date: Tue, 10 Mar 2015 15:45:36 -0300 Subject: [PATCH 157/329] Remove blank style tag in header Remove the tag From a188afb0da25503d1800e1959da4d5f75504c273 Mon Sep 17 00:00:00 2001 From: vsguts Date: Thu, 5 Mar 2015 21:25:11 +0300 Subject: [PATCH 158/329] Fixing symlink removal. Closes #854 --- PHPCI/Builder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Builder.php b/PHPCI/Builder.php index d911e04b..619c0b38 100644 --- a/PHPCI/Builder.php +++ b/PHPCI/Builder.php @@ -223,7 +223,7 @@ class Builder implements LoggerAwareInterface if (IS_WIN) { $cmd = 'rmdir /S /Q "%s"'; } - $this->executeCommand($cmd, $this->buildPath); + $this->executeCommand($cmd, rtrim($this->buildPath, '/')); } catch (\Exception $ex) { $this->build->setStatus(Build::STATUS_FAILED); $this->buildLogger->logFailure(Lang::get('exception') . $ex->getMessage()); From 5f2de9a6798ffee196345da183b5f16573aab101 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Tue, 10 Mar 2015 20:20:54 +0000 Subject: [PATCH 159/329] Update to only build the latest commit from a Github pull request webhook. --- PHPCI/Controller/WebhookController.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/PHPCI/Controller/WebhookController.php b/PHPCI/Controller/WebhookController.php index 619eec16..7e38d60a 100644 --- a/PHPCI/Controller/WebhookController.php +++ b/PHPCI/Controller/WebhookController.php @@ -232,6 +232,11 @@ class WebhookController extends \PHPCI\Controller } foreach ($response['body'] as $commit) { + // Skip all but the current HEAD commit ID: + if ($commit['sha'] != $payload['head']['sha']) { + continue; + } + $branch = str_replace('refs/heads/', '', $payload['pull_request']['base']['ref']); $committer = $commit['commit']['author']['email']; $message = $commit['commit']['message']; From ecc92b5f3eed0e2ea5bc36cf79add5086a42a9f1 Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 11 Mar 2015 07:48:22 +0000 Subject: [PATCH 160/329] Fixing pull request builds. --- PHPCI/Controller/WebhookController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Controller/WebhookController.php b/PHPCI/Controller/WebhookController.php index 7e38d60a..78824ddb 100644 --- a/PHPCI/Controller/WebhookController.php +++ b/PHPCI/Controller/WebhookController.php @@ -233,7 +233,7 @@ class WebhookController extends \PHPCI\Controller foreach ($response['body'] as $commit) { // Skip all but the current HEAD commit ID: - if ($commit['sha'] != $payload['head']['sha']) { + if ($commit['sha'] != $payload['pull_request']['head']['sha']) { continue; } From 70f0d2516f7c3155a0c04e03179176b844f5005d Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Fri, 13 Mar 2015 13:31:38 +0000 Subject: [PATCH 161/329] Removed log output so that it matches the other plugins which don't pollute the build log, and to prevent issues with the log output not being escaped --- PHPCI/Plugin/TechnicalDebt.php | 1 - 1 file changed, 1 deletion(-) diff --git a/PHPCI/Plugin/TechnicalDebt.php b/PHPCI/Plugin/TechnicalDebt.php index eca05213..6fdc81a7 100755 --- a/PHPCI/Plugin/TechnicalDebt.php +++ b/PHPCI/Plugin/TechnicalDebt.php @@ -193,7 +193,6 @@ class TechnicalDebt implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin $content = trim($allLines[$lineNumber - 1]); $errorCount++; - $this->phpci->log("Found $search on line $lineNumber of $file:\n$content"); $fileName = str_replace($this->directory, '', $file); $data[] = array( From 9ad0e90fa19dc169bda65e1280c6aee41d223c8d Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Mon, 16 Mar 2015 11:05:33 +0000 Subject: [PATCH 162/329] Preventing the plugin failing due to an undefined variable --- PHPCI/Plugin/Wipe.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PHPCI/Plugin/Wipe.php b/PHPCI/Plugin/Wipe.php index 1a71e293..86e543b5 100644 --- a/PHPCI/Plugin/Wipe.php +++ b/PHPCI/Plugin/Wipe.php @@ -61,8 +61,8 @@ class Wipe implements \PHPCI\Plugin if (IS_WIN) { $cmd = 'rmdir /S /Q "%s"'; } - $success = $this->phpci->executeCommand($cmd, $this->directory); + return $this->phpci->executeCommand($cmd, $this->directory); } - return $success; + return true; } } From 52b2f87df22e4152dd2e3f5a288c0f4f091b0adf Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Mon, 16 Mar 2015 11:09:45 +0000 Subject: [PATCH 163/329] Parsing variables in the Wipe plugin --- PHPCI/Plugin/Wipe.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Plugin/Wipe.php b/PHPCI/Plugin/Wipe.php index 1a71e293..7de4b975 100644 --- a/PHPCI/Plugin/Wipe.php +++ b/PHPCI/Plugin/Wipe.php @@ -43,7 +43,7 @@ class Wipe implements \PHPCI\Plugin $path = $phpci->buildPath; $this->phpci = $phpci; $this->build = $build; - $this->directory = isset($options['directory']) ? $options['directory'] : $path; + $this->directory = isset($options['directory']) ? $this->phpci->interpolate($options['directory']) : $path; } /** From fdaaa1ede4a34d54955adb5449c53ce4a2fd0711 Mon Sep 17 00:00:00 2001 From: Stephen Ball Date: Mon, 16 Mar 2015 11:10:03 +0000 Subject: [PATCH 164/329] Parsing variables in the code coverage output directory for PHPUnit --- PHPCI/Plugin/PhpUnit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Plugin/PhpUnit.php b/PHPCI/Plugin/PhpUnit.php index 70e0e74f..fc597f2d 100644 --- a/PHPCI/Plugin/PhpUnit.php +++ b/PHPCI/Plugin/PhpUnit.php @@ -133,7 +133,7 @@ class PhpUnit implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin } if (isset($options['coverage'])) { - $this->coverage = " --coverage-html {$options['coverage']} "; + $this->coverage = ' --coverage-html ' . $this->phpci->interpolate($options['coverage']) . ' '; } } From 1dd1af2443157e28860ab18708e2d9563960b1bb Mon Sep 17 00:00:00 2001 From: Mark Clements Date: Wed, 18 Mar 2015 09:47:47 +0000 Subject: [PATCH 165/329] Switching tabs to spaces as per style guide. No functional changes. --- PHPCI/Command/InstallCommand.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PHPCI/Command/InstallCommand.php b/PHPCI/Command/InstallCommand.php index a50eefec..d10f34b7 100644 --- a/PHPCI/Command/InstallCommand.php +++ b/PHPCI/Command/InstallCommand.php @@ -323,8 +323,8 @@ class InstallCommand extends Command { $output->write(Lang::get('setting_up_db')); - $phinxBinary = escapeshellarg(PHPCI_DIR . 'vendor/bin/phinx'); - $phinxScript = escapeshellarg(PHPCI_DIR . 'phinx.php'); + $phinxBinary = escapeshellarg(PHPCI_DIR . 'vendor/bin/phinx'); + $phinxScript = escapeshellarg(PHPCI_DIR . 'phinx.php'); shell_exec($phinxBinary . ' migrate -c ' . $phinxScript); $output->writeln(''.Lang::get('ok').''); From 3467e77e7489112abef26c52537106b2c75b1559 Mon Sep 17 00:00:00 2001 From: Adirelle Date: Sun, 8 Mar 2015 17:57:16 +0100 Subject: [PATCH 166/329] Use a CSRF token on the login form to prevent CSRF attacks. --- PHPCI/Controller/SessionController.php | 46 +++++++++++++++++++++----- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/PHPCI/Controller/SessionController.php b/PHPCI/Controller/SessionController.php index 540b043f..8fa9d48b 100644 --- a/PHPCI/Controller/SessionController.php +++ b/PHPCI/Controller/SessionController.php @@ -43,15 +43,23 @@ class SessionController extends \PHPCI\Controller $isLoginFailure = false; if ($this->request->getMethod() == 'POST') { - $user = $this->userStore->getByEmail($this->getParam('email')); - if ($user && password_verify($this->getParam('password', ''), $user->getHash())) { - $_SESSION['phpci_user_id'] = $user->getId(); - $response = new b8\Http\Response\RedirectResponse(); - $response->setHeader('Location', $this->getLoginRedirect()); - return $response; - } else { + $token = $this->getParam('token'); + if ($token === null || $token !== $_SESSION['login_token']) { $isLoginFailure = true; + } else { + unset($_SESSION['login_token']); + + $user = $this->userStore->getByEmail($this->getParam('email')); + + if ($user && password_verify($this->getParam('password', ''), $user->getHash())) { + $_SESSION['phpci_user_id'] = $user->getId(); + $response = new b8\Http\Response\RedirectResponse(); + $response->setHeader('Location', $this->getLoginRedirect()); + return $response; + } else { + $isLoginFailure = true; + } } } @@ -78,9 +86,15 @@ class SessionController extends \PHPCI\Controller $pwd->setClass('btn-success'); $form->addField($pwd); + $tokenValue = $this->generateToken(); + $_SESSION['login_token'] = $tokenValue; + $token = new b8\Form\Element\Hidden('token'); + $token->setValue($tokenValue); + $form->addField($token); + $this->view->form = $form->render(); $this->view->failed = $isLoginFailure; - + return $this->view->render(); } @@ -180,4 +194,20 @@ class SessionController extends \PHPCI\Controller return $rtn; } + + /** Generate a random token. + * + * @return string + */ + protected function generateToken() + { + if(function_exists('openssl_random_pseudo_bytes')) { + return bin2hex(openssl_random_pseudo_bytes(16)); + } + + return sprintf("%04x", mt_rand(0, 0xFFFF)) + . sprintf("%04x", mt_rand(0, 0xFFFF)) + . sprintf("%04x", mt_rand(0, 0xFFFF)) + . sprintf("%04x", mt_rand(0, 0xFFFF)); + } } From f29ff197c62181d1d7918f7baa768d6d81f19fa4 Mon Sep 17 00:00:00 2001 From: Adirelle Date: Sun, 8 Mar 2015 17:53:27 +0100 Subject: [PATCH 167/329] Generate an new session identifier on successful login to prevent session fixation attacks. --- PHPCI/Controller/SessionController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/PHPCI/Controller/SessionController.php b/PHPCI/Controller/SessionController.php index 8fa9d48b..6ad2681e 100644 --- a/PHPCI/Controller/SessionController.php +++ b/PHPCI/Controller/SessionController.php @@ -53,6 +53,7 @@ class SessionController extends \PHPCI\Controller $user = $this->userStore->getByEmail($this->getParam('email')); if ($user && password_verify($this->getParam('password', ''), $user->getHash())) { + session_regenerate_id(true); $_SESSION['phpci_user_id'] = $user->getId(); $response = new b8\Http\Response\RedirectResponse(); $response->setHeader('Location', $this->getLoginRedirect()); From ea3b0c219afb0ba0e5bc09c4ab21d5990c593323 Mon Sep 17 00:00:00 2001 From: Adirelle Date: Tue, 10 Mar 2015 21:29:10 +0100 Subject: [PATCH 168/329] Code style fixed. --- PHPCI/Controller/SessionController.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/PHPCI/Controller/SessionController.php b/PHPCI/Controller/SessionController.php index 6ad2681e..eb7001df 100644 --- a/PHPCI/Controller/SessionController.php +++ b/PHPCI/Controller/SessionController.php @@ -43,7 +43,6 @@ class SessionController extends \PHPCI\Controller $isLoginFailure = false; if ($this->request->getMethod() == 'POST') { - $token = $this->getParam('token'); if ($token === null || $token !== $_SESSION['login_token']) { $isLoginFailure = true; @@ -202,7 +201,7 @@ class SessionController extends \PHPCI\Controller */ protected function generateToken() { - if(function_exists('openssl_random_pseudo_bytes')) { + if (function_exists('openssl_random_pseudo_bytes')) { return bin2hex(openssl_random_pseudo_bytes(16)); } From d8df6cab4a6311df1e4803364c9af0e5f73e47ff Mon Sep 17 00:00:00 2001 From: LAHAXE Arnaud Date: Tue, 17 Mar 2015 15:49:52 +0100 Subject: [PATCH 169/329] Fix french typo mistake --- PHPCI/Languages/lang.fr.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PHPCI/Languages/lang.fr.php b/PHPCI/Languages/lang.fr.php index 7d438d2f..da2e35b4 100644 --- a/PHPCI/Languages/lang.fr.php +++ b/PHPCI/Languages/lang.fr.php @@ -264,7 +264,7 @@ PHPCI', // Plugins 'cannot_update_composer' => 'PHPCI ne peut pas mettre à jour le fichier composer.json pour vous, il n\'est pas modifiable.', 'x_has_been_removed' => '%s a été supprimé.', - 'x_has_been_added' => '%s a été ajouté au fichier composer.json poru vous et il sera installé la prochaine fois + 'x_has_been_added' => '%s a été ajouté au fichier composer.json pour vous et il sera installé la prochaine fois que vous lancerez "composer update".', 'enabled_plugins' => 'Plugins activés', 'provided_by_package' => 'Fournis par le paquet', From 3a867eb9d56117ff9195cf34b60ff68621fa4893 Mon Sep 17 00:00:00 2001 From: corpsee Date: Mon, 16 Mar 2015 12:43:01 +0600 Subject: [PATCH 170/329] Fixed 'start' string for ru lang Fixed 'from' and 'to' strings for ru lang --- PHPCI/Languages/lang.ru.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PHPCI/Languages/lang.ru.php b/PHPCI/Languages/lang.ru.php index 422f17e1..ed5a8eeb 100644 --- a/PHPCI/Languages/lang.ru.php +++ b/PHPCI/Languages/lang.ru.php @@ -188,10 +188,10 @@ PHPCI', 'class' => 'Класс', 'method' => 'Метод', 'message' => 'Сообщение', - 'start' => 'Запуск', + 'start' => 'Начало', 'end' => 'Конец', - 'from' => 'От', - 'to' => 'До', + 'from' => 'Из', + 'to' => 'В', 'suite' => 'Комплект', 'test' => 'Тест', 'result' => 'Результат', From d804438a8785760987c6c8ae9811217d136fb246 Mon Sep 17 00:00:00 2001 From: Adirelle Date: Thu, 26 Feb 2015 15:57:45 +0100 Subject: [PATCH 171/329] Use sensiolabs/ansi-to-html to parse the build logs. Added an AnsiConverter helper. Use the AnsiConverter in the email and page templates that display the build log. Use a dedicated stylesheet for the ANSI converter. It can be customized. It can be inlined in the notifications. Do not use ProphecyTestCase when not needed. --- PHPCI/Controller/BuildController.php | 7 +-- PHPCI/Helper/AnsiConverter.php | 55 ++++++++++++++++++++++++ PHPCI/View/Email/success.phtml | 4 +- PHPCI/View/layout.phtml | 1 + Tests/PHPCI/Helper/AnsiConverterTest.php | 20 +++++++++ composer.json | 3 +- composer.lock | 47 +++++++++++++++++++- public/assets/css/ansi-colors.css | 32 ++++++++++++++ public/assets/js/build-plugins/log.js | 2 +- 9 files changed, 162 insertions(+), 9 deletions(-) create mode 100644 PHPCI/Helper/AnsiConverter.php create mode 100644 Tests/PHPCI/Helper/AnsiConverterTest.php create mode 100644 public/assets/css/ansi-colors.css diff --git a/PHPCI/Controller/BuildController.php b/PHPCI/Controller/BuildController.php index bf898d2d..e4660ba7 100644 --- a/PHPCI/Controller/BuildController.php +++ b/PHPCI/Controller/BuildController.php @@ -13,6 +13,7 @@ use b8; use b8\Exception\HttpException\NotFoundException; use b8\Http\Response\JsonResponse; use PHPCI\BuildFactory; +use PHPCI\Helper\AnsiConverter; use PHPCI\Helper\Lang; use PHPCI\Model\Build; use PHPCI\Model\Project; @@ -198,11 +199,7 @@ class BuildController extends \PHPCI\Controller */ protected function cleanLog($log) { - $log = str_replace('[0;32m', '', $log); - $log = str_replace('[0;31m', '', $log); - $log = str_replace('[0m', '', $log); - - return $log; + return AnsiConverter::convert($log); } /** diff --git a/PHPCI/Helper/AnsiConverter.php b/PHPCI/Helper/AnsiConverter.php new file mode 100644 index 00000000..a5e42269 --- /dev/null +++ b/PHPCI/Helper/AnsiConverter.php @@ -0,0 +1,55 @@ +convert($text); + } + + /** + * Do not instanciate this class. + */ + private function __construct() + { + } +} diff --git a/PHPCI/View/Email/success.phtml b/PHPCI/View/Email/success.phtml index a3a604c5..342e3483 100644 --- a/PHPCI/View/Email/success.phtml +++ b/PHPCI/View/Email/success.phtml @@ -1,3 +1,5 @@ + +
    @@ -8,7 +10,7 @@

    Your commit getCommitId(); ?> genrate a successfull build in project getTitle(); ?>.

    getCommitMessage(); ?>

    - 
    getLog(); ?>
    + 
    getLog()); ?>

    You can review your commit and the build log.

    diff --git a/PHPCI/View/layout.phtml b/PHPCI/View/layout.phtml index 33290fb3..72ef27ff 100644 --- a/PHPCI/View/layout.phtml +++ b/PHPCI/View/layout.phtml @@ -13,6 +13,7 @@ + diff --git a/Tests/PHPCI/Helper/AnsiConverterTest.php b/Tests/PHPCI/Helper/AnsiConverterTest.php new file mode 100644 index 00000000..4d1e8522 --- /dev/null +++ b/Tests/PHPCI/Helper/AnsiConverterTest.php @@ -0,0 +1,20 @@ +This is red !'; + + $actualOutput = AnsiConverter::convert($input); + + $this->assertEquals($expectedOutput, $actualOutput); + } +} diff --git a/composer.json b/composer.json index 2eec5e30..6658bffd 100644 --- a/composer.json +++ b/composer.json @@ -40,7 +40,8 @@ "psr/log": "~1.0", "monolog/monolog": "~1.6", "pimple/pimple": "~1.1", - "robmorgan/phinx": "~0.4" + "robmorgan/phinx": "~0.4", + "sensiolabs/ansi-to-html": "~1.1" }, "require-dev": { diff --git a/composer.lock b/composer.lock index c5abc102..56c28655 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "4ae188c6be1c1388de6271a3b0e0475d", + "hash": "5fc23800ea77b50b496d34f7aa5cf6b3", "packages": [ { "name": "block8/b8framework", @@ -315,6 +315,50 @@ ], "time": "2015-02-23 16:38:12" }, + { + "name": "sensiolabs/ansi-to-html", + "version": "v1.1.0", + "source": { + "type": "git", + "url": "https://github.com/sensiolabs/ansi-to-html.git", + "reference": "92d2ef7ffba5418be060d8ba8adaf7223d741f93" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sensiolabs/ansi-to-html/zipball/92d2ef7ffba5418be060d8ba8adaf7223d741f93", + "reference": "92d2ef7ffba5418be060d8ba8adaf7223d741f93", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "suggest": { + "twig/twig": "Provides nice templating features" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-0": { + "SensioLabs\\AnsiConverter": "." + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "A library to convert a text with ANSI codes to HTML", + "time": "2014-08-01 14:02:39" + }, { "name": "swiftmailer/swiftmailer", "version": "v5.3.1", @@ -2030,6 +2074,7 @@ "minimum-stability": "stable", "stability-flags": [], "prefer-stable": false, + "prefer-lowest": false, "platform": { "php": ">=5.3.8", "ext-pdo": "*", diff --git a/public/assets/css/ansi-colors.css b/public/assets/css/ansi-colors.css new file mode 100644 index 00000000..c3011299 --- /dev/null +++ b/public/assets/css/ansi-colors.css @@ -0,0 +1,32 @@ +.ansi_color_fg_black { color: black } +.ansi_color_bg_black { background-color: black } +.ansi_color_fg_red { color: darkred } +.ansi_color_bg_red { background-color: darkred } +.ansi_color_fg_green { color: green } +.ansi_color_bg_green { background-color: green } +.ansi_color_fg_yellow { color: yellow } +.ansi_color_bg_yellow { background-color: yellow } +.ansi_color_fg_blue { color: blue } +.ansi_color_bg_blue { background-color: blue } +.ansi_color_fg_magenta { color: darkmagenta } +.ansi_color_bg_magenta { background-color: darkmagenta } +.ansi_color_fg_cyan { color: cyan } +.ansi_color_bg_cyan { background-color: cyan } +.ansi_color_fg_white { color: white } +.ansi_color_bg_white { background-color: white } +.ansi_color_fg_brblack { color: black } +.ansi_color_bg_brblack { background-color: black } +.ansi_color_fg_brred { color: red } +.ansi_color_bg_brred { background-color: red } +.ansi_color_fg_brgreen { color: lightgreen } +.ansi_color_bg_brgreen { background-color: lightgreen } +.ansi_color_fg_bryellow { color: lightyellow } +.ansi_color_bg_bryellow { background-color: lightyellow } +.ansi_color_fg_brblue { color: lightblue } +.ansi_color_bg_brblue { background-color: lightblue } +.ansi_color_fg_brmagenta { color: magenta } +.ansi_color_bg_brmagenta { background-color: magenta } +.ansi_color_fg_brcyan { color: lightcyan } +.ansi_color_bg_brcyan { background-color: lightcyan } +.ansi_color_fg_brwhite { color: white } +.ansi_color_bg_brwhite { background-color: white } diff --git a/public/assets/js/build-plugins/log.js b/public/assets/js/build-plugins/log.js index 8798e23c..44ebab2b 100644 --- a/public/assets/js/build-plugins/log.js +++ b/public/assets/js/build-plugins/log.js @@ -8,7 +8,7 @@ var logPlugin = ActiveBuild.UiPlugin.extend({ }, render: function() { - var container = $('
    ');
+        var container = $('
    ');
         container.css({height: '300px', 'overflow-y': 'auto'});
         container.html(ActiveBuild.buildData.log);
 

From 2c43cd1cace4dbb9c25142dedc977d7507134018 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolpla=C3=A1s?= 
Date: Sun, 1 Mar 2015 19:56:16 -0200
Subject: [PATCH 172/329] Add spanish laguage support

---
 PHPCI/Languages/lang.es.php | 385 ++++++++++++++++++++++++++++++++++++
 1 file changed, 385 insertions(+)
 create mode 100644 PHPCI/Languages/lang.es.php

diff --git a/PHPCI/Languages/lang.es.php b/PHPCI/Languages/lang.es.php
new file mode 100644
index 00000000..7c9f5a62
--- /dev/null
+++ b/PHPCI/Languages/lang.es.php
@@ -0,0 +1,385 @@
+ 'Español',
+    'language' => 'Lenguaje',
+
+    // Log in:
+    'log_in_to_phpci' => 'Ingresar a PHPCI',
+    'login_error' => 'Email o contraseña incorrectos',
+    'forgotten_password_link' => '¿Olvidaste tu contraseña?',
+    'reset_emailed' => 'Te hemos enviado un email para reiniciar tu contraseña.',
+    'reset_header' => '¡No te preocupes!
    Solo tienes que ingresar tu dirección de email
+                            y te enviaremos por email un enlace para reiniciar tu contraseña.',
+    'reset_email_address' => 'Ingresa tu dirección de email:',
+    'reset_send_email' => 'Enviar enlace',
+    'reset_enter_password' => 'Ingresa una nueva contraseña',
+    'reset_new_password' => 'Nueva contraseña:',
+    'reset_change_password' => 'Cambiar contraseña',
+    'reset_no_user_exists' => 'No existe ningún usuario con ese email, por favor intenta  nuevamente.',
+    'reset_email_body' => 'Hola %s,
+
+Has recibido este correo porque tú, o alguien más, ha solicitado reiniciar la contraseña de PHPCI
+
+Si fuiste tú, por favor haz click en el siguiente enlace para reiniciar tu contraseña: %ssession/reset-password/%d/%s
+
+De lo contrario, por favor ignora este correo y ninguna acción será realizada.
+
+Gracias,
+
+PHPCI',
+
+    'reset_email_title' => 'Reiniciar contraseña de PHPCI para %s',
+    'reset_invalid' => 'Pedido inválido.',
+    'email_address' => 'Dirección de email',
+    'password' => 'Contraseña',
+    'log_in' => 'Ingresar',
+
+
+    // Top Nav
+    'toggle_navigation' => 'Activar navegación',
+    'n_builds_pending' => '%d builds pendientes',
+    'n_builds_running' => '%d builds ejecutándose',
+    'edit_profile' => 'Editar Perfil',
+    'sign_out' => 'Cerrar Sesión',
+    'branch_x' => 'Rama: %s',
+    'created_x' => 'Creada el: %s',
+    'started_x' => 'Comenzó: %s',
+
+    // Sidebar
+    'hello_name' => 'Hola, %s',
+    'dashboard' => 'Escritorio',
+    'admin_options' => 'Opciones de Admin.',
+    'add_project' => 'Agregar Proyecto',
+    'settings' => 'Configuración',
+    'manage_users' => 'Administrar Usuarios',
+    'plugins' => 'Plugins',
+    'view' => 'Vista',
+    'build_now' => 'Ejecutar Build',
+    'edit_project' => 'Editar Proyecto',
+    'delete_project' => 'Eliminar Proyecto',
+
+    // Project Summary:
+    'no_builds_yet' => '¡No existen builds aún!',
+    'x_of_x_failed' => '%d de los últimos %d builds fallaron.',
+    'x_of_x_failed_short' => '%d / %d fallaron.',
+    'last_successful_build' => ' El último build exitoso fue %s.',
+    'never_built_successfully' => ' Este proyecto nunca tuvo un build exitoso.',
+    'all_builds_passed' => 'Todos los últimos %d builds pasaron.',
+    'all_builds_passed_short' => '%d / %d pasaron.',
+    'last_failed_build' => ' El último build en fallar fue %s.',
+    'never_failed_build' => ' Este proyecto no tiene ningún build fallido.',
+    'view_project' => 'Ver Proyecto',
+
+    // Timeline:
+    'latest_builds' => 'Últimos builds',
+    'pending' => 'Pediente',
+    'running' => 'Ejecutando',
+    'success' => 'Éxito',
+    'successful' => 'Exitoso',
+    'failed' => 'Falló',
+    'manual_build' => 'Build Manual',
+
+    // Add/Edit Project:
+    'new_project' => 'Nuevo Proyecto',
+    'project_x_not_found' => 'El Proyecto con ID %d no existe.',
+    'project_details' => 'Detalles del Proyecto',
+    'public_key_help' => 'Para facilitarte, hemos generado un par de llaves SSH para que uses en este proyecto.
+    Para usarlo, sólo agrega la siguiente llave pública a la sección de "deploy keys"
+                            de tu plataforma de hosting de versionado de código.',
+    'select_repository_type' => 'Selecciona tipo de repositorio...',
+    'github' => 'GitHub',
+    'bitbucket' => 'Bitbucket',
+    'gitlab' => 'GitLab',
+    'remote' => 'URL Remota',
+    'local' => 'Path local',
+    'hg'    => 'Mercurial',
+    'svn'   => 'Subversion',
+
+    'where_hosted' => '¿Dónde está alojado tu proyecto?',
+    'choose_github' => 'Selecciona un repositorio de GitHub:',
+
+    'repo_name' => 'Nombre del repositorio / URL (Remoto) o Ruta (Local)',
+    'project_title' => 'Titulo del proyecto',
+    'project_private_key' => 'Clave privada a usar para acceder al repositorio
+                                (dejar en blanco para remotos locales o anónimos)',
+    'build_config' => 'Configuración PHPCI para builds del proyecto
+                                (en caso que no puedas agregar el archivo phpci.yml al repositorio)',
+    'default_branch' => 'Nombre de la rama por defecto',
+    'allow_public_status' => '¿Activar página pública con el estado del proyecto?',
+    'save_project' => 'Guardar Proyecto',
+
+    'error_mercurial' => 'La URL del repositorio de Mercurial debe comenzar con http:// or https://',
+    'error_remote' => 'La URL del repositorio debe comenzar con git://, http:// or https://',
+    'error_gitlab' => 'El nombre del repositorio de GitLab debe tener el formato "user@domain.tld:owner/repo.git"',
+    'error_github' => 'El nombre del repositorio debe tener el formato "owner/repo"',
+    'error_bitbucket' => 'El nombre del repo debe tener el formato "owner/repo"',
+    'error_path' => 'La ruta especificada no existe.',
+
+    // View Project:
+    'all_branches' => 'Todas las ramas',
+    'builds' => 'Builds',
+    'id' => 'ID',
+    'project' => 'Proyecto',
+    'commit' => 'Commit',
+    'branch' => 'Rama',
+    'status' => 'Estado',
+    'prev_link' => '« Anterior',
+    'next_link' => 'Siguiente »',
+    'public_key' => 'Llave pública',
+    'delete_build' => 'Eliminar Build',
+
+    'webhooks' => 'Webhooks',
+    'webhooks_help_github' => 'Para compilar automáticamente este proyecto cada vez que se realiza un commit, agreagar la siguiente URL
+                                como un nuevo "webhook" en la sección Webhooks
+                                and Services  de tu repositorio en GitHub.',
+
+    'webhooks_help_gitlab' => 'Para compilar automáticamente este proyecto, cada vez que se realiza un commit, agreagar la siguiente URL
+                                como una "WebHook URL" en la sección "web hooks" de tu repositorio en GitLab.',
+
+    'webhooks_help_bitbucket' => 'Para compilar automáticamente este proyecto, cada vez que se realiza un commit, agreagar la siguiente URL
+                                como un servicio "POST" en la sección
+                                
+                                Services de tu repositorio en Bitbucket.',
+
+    // View Build
+    'build_x_not_found' => 'El build con ID %d no existe.',
+    'build_n' => 'Build %d',
+    'rebuild_now' => 'Rebuild Ahora',
+
+
+    'committed_by_x' => 'Commit hecho por %s',
+    'commit_id_x' => 'Commit: %s',
+
+    'chart_display' => 'Este gráfico será mostrado una vez que el build se haya completado.',
+
+    'build' => 'Build',
+    'lines' => 'Líneas',
+    'comment_lines' => 'Líneas de comentario',
+    'noncomment_lines' => 'Líneas no comentario',
+    'logical_lines' => 'Líneas lógicas',
+    'lines_of_code' => 'Líneas de código',
+    'build_log' => 'Log',
+    'quality_trend' => 'Tendencia de calidad',
+    'codeception_errors' => 'Errores de Codeception',
+    'phpmd_warnings' => 'PHPMD Warnings',
+    'phpcs_warnings' => 'PHPCS Warnings',
+    'phpcs_errors' => 'PHPCS Errors',
+    'phplint_errors' => 'Lint Errors',
+    'phpunit_errors' => 'PHPUnit Errors',
+    'phpdoccheck_warnings' => 'Docblocks faltantes',
+    'issues' => 'Incidencias',
+
+    'codeception' => 'Codeception',
+    'phpcpd' => 'PHP Copy/Paste Detector',
+    'phpcs' => 'PHP Code Sniffer',
+    'phpdoccheck' => 'Missing Docblocks',
+    'phpmd' => 'PHP Mess Detector',
+    'phpspec' => 'PHP Spec',
+    'phpunit' => 'PHP Unit',
+    'technical_debt' => 'Deuda Técnica',
+    'behat' => 'Behat',
+
+    'file' => 'Archivo',
+    'line' => 'Línea',
+    'class' => 'Clase',
+    'method' => 'Método',
+    'message' => 'Mensaje',
+    'start' => 'Inicio',
+    'end' => 'Fin',
+    'from' => 'De',
+    'to' => 'Para',
+    'suite' => 'Suite',
+    'test' => 'Test',
+    'result' => 'Resultado',
+    'ok' => 'OK',
+    'took_n_seconds' => 'Tomó %d segundos',
+    'build_created' => 'Build Creado',
+    'build_started' => 'Build Comenzado',
+    'build_finished' => 'Build Terminado',
+
+    // Users
+    'name' => 'Nombre',
+    'password_change' => 'Contraseña (dejar en blanco si no quiere cambiarla)',
+    'save' => 'Guardar »',
+    'update_your_details' => 'Actualizar los detalles',
+    'your_details_updated' => 'Tus detalles han sido actualizados.',
+    'add_user' => 'Agregar Usuario',
+    'is_admin' => '¿Es Admin?',
+    'yes' => 'Si',
+    'no' => 'No',
+    'edit' => 'Editar',
+    'edit_user' => 'Editar Usuario',
+    'delete_user' => 'Delete Usuario',
+    'user_n_not_found' => 'Usuario con ID %d no existe.',
+    'is_user_admin' => '¿Es un usuario administrador?',
+    'save_user' => 'Guardar Usuario',
+
+    // Settings:
+    'settings_saved' => 'Tu configuración ha sido guardada.',
+    'settings_check_perms' => 'Tu configuración no fue guardada, verificar los permisos del archivo config.yml.',
+    'settings_cannot_write' => 'PHPCI no puede escribir en el archivo config.yml file, la configuración no será guardada correctamente
+                                hasta no corregir esto.',
+    'settings_github_linked' => 'Tu cuenta GitHub ha sido conectada.',
+    'settings_github_not_linked' => 'No se pudo conectar a tu cuenta GitHub.',
+    'build_settings' => 'Configuración del Build ',
+    'github_application' => 'Aplicación GitHub',
+    'github_sign_in' => 'Antes de comenzar a utilizar GitHub, tienes que ingresar y permitir
+                            el acceso a tu cuenta a PHPCI.',
+    'github_phpci_linked' => 'PHPCI ha sido conectado a tu cuenta GitHub.',
+    'github_where_to_find' => 'Donde encontrar estos...',
+    'github_where_help' => 'Si eres priopietario de la aplicaión que quieres usar, puedes encontrar esta información en
+                            el área de configuración de aplicaciones.',
+
+    'email_settings' => 'Configuraciones de Email',
+    'email_settings_help' => 'Para que PHPCI pueda enviar email con el status de los builds,
+                                debes configurar las siguientes propiedades SMTP.',
+
+    'application_id' => 'ID de aplicación',
+    'application_secret' => 'Application Secret',
+
+    'smtp_server' => 'Servidor SMTP',
+    'smtp_port' => 'Puerto SMTP',
+    'smtp_username' => 'Usuario SMTP',
+    'smtp_password' => 'Contraseña SMTP',
+    'from_email_address' => 'Dirección de email DE',
+    'default_notification_address' => 'Dirección de correo de notificación por defecto',
+    'use_smtp_encryption' => 'Usar encriptación SMTP?',
+    'none' => 'None',
+    'ssl' => 'SSL',
+    'tls' => 'TLS',
+
+    'failed_after' => 'Considerar el build como fallido luego de ',
+    '5_mins' => '5 Minutos',
+    '15_mins' => '15 Minutos',
+    '30_mins' => '30 Minutos',
+    '1_hour' => '1 Hora',
+    '3_hours' => '3 Horas',
+
+    // Plugins
+    'cannot_update_composer' => 'PHPCI no puede actualizar composer.json porque no tiene permisos de escritura.',
+    'x_has_been_removed' => '%s ha sido elimiando.',
+    'x_has_been_added' => '%s ha sido agregado a composer.json y será instalado la próxima vez que ejecutes composer update.',
+    'enabled_plugins' => 'Activar Plugins',
+    'provided_by_package' => 'Provisto por Paquete',
+    'installed_packages' => 'Paquetes Instalados',
+    'suggested_packages' => 'Paquetes Sugeridos',
+    'title' => 'Título',
+    'description' => 'Descripción',
+    'version' => 'Versión',
+    'install' => 'Instalar »',
+    'remove' => 'Eliminar »',
+    'search_packagist_for_more' => 'Buscar más paquetes en Packagist',
+    'search' => 'Buscar »',
+
+    // Installer
+    'installation_url' => 'URL de la instalación PHPCI',
+    'db_host' => 'Host',
+    'db_name' => 'Nombre de la base de datos',
+    'db_user' => 'Usuario de la base de datos',
+    'db_pass' => 'Clave de la base de datos',
+    'admin_name' => 'Nombre del Admin',
+    'admin_pass' => 'Clave del Admin',
+    'admin_email' => 'Email de Admin',
+    'config_path' => 'Ruta al archivo config',
+    'install_phpci' => 'Instalar PHPCI',
+    'welcome_to_phpci' => 'Bienvenido a PHPCI',
+    'please_answer' => 'Por favor, responde las siguientes preguntas:',
+    'phpci_php_req' => 'PHPCI requiere al menos PHP 5.3.8 para funcionar.',
+    'extension_required' => 'Extensión requerida: %s',
+    'function_required' => 'PHPCI debe poder invocar la función %s(). Está deshabilitada en php.ini?',
+    'requirements_not_met' => 'PHPCI no pudo ser instalado, ya que no se cumplen todos los requerimientos.
+                                Por favor, corrige los errores antes de continuar.',
+    'must_be_valid_email' => 'Debe ser una dirección de correos válida.',
+    'must_be_valid_url' => 'Debe ser una URL válida.',
+    'enter_name' => 'Nombre del Admin:',
+    'enter_email' => 'Email del Admin:',
+    'enter_password' => 'Contraseña de Admin:',
+    'enter_phpci_url' => 'La URL de PHPCI ("Por ejemplo: http://phpci.local"): ',
+
+    'enter_db_host' => 'Por favor, ingresa el servidor MySQL [localhost]: ',
+    'enter_db_name' => 'Por favor, ingresa el nombre de la base de datos MySQL [phpci]: ',
+    'enter_db_user' => 'Por favor, ingresa el usuario MySQL [phpci]: ',
+    'enter_db_pass' => 'Por favor, ingresa la contraseña MySQL: ',
+    'could_not_connect' => 'PHPCI no pudo conectarse a MySQL con los datos dados. Por favor, intenta nuevamente.',
+    'setting_up_db' => 'Configurando base de datos... ',
+    'user_created' => '¡Cuenta de usuario creada!',
+    'failed_to_create' => 'PHPCI no pudo crear la cuenta de admin.',
+    'config_exists' => 'El archivo config de PHPCI ya existe y no es vacío.',
+    'update_instead' => 'Si está intentando actualizar PHPCI, por favor, utiliza phpci:update.',
+
+    // Update
+    'update_phpci' => 'Actuliza la base de datos para reflejar los modelos actualizados.',
+    'updating_phpci' => 'Actualizando base de datos PHPCI: ',
+    'not_installed' => 'PHPCI no está instalado.',
+    'install_instead' => 'Por favor, instala PHPCI via phpci:install.',
+
+    // Poll Command
+    'poll_github' => 'Chequear en GitHub si se necesita comenzar un Build.',
+    'no_token' => 'No se encontró ningún token GitHub',
+    'finding_projects' => 'Buscando proyectos para chequear',
+    'found_n_projects' => 'Se encontraron %d proyectos',
+    'last_commit_is' => 'El último commit en GitHub para %s es %s',
+    'adding_new_build' => 'Último commit es diferente a la base de datos, agregando nuevo build.',
+    'finished_processing_builds' => 'Fin de procesamiento de builds.',
+
+    // Create Admin
+    'create_admin_user' => 'Crear un usuario Admin',
+    'incorrect_format' => 'Formato incorrecto',
+
+    // Run Command
+    'run_all_pending' => 'Ejecutar todos los builds PHPCI pendientes.',
+    'finding_builds' => 'Buscando builds a procesar',
+    'found_n_builds' => 'Se encontraron %d builds',
+    'skipping_build' => 'Saltando Build %d - Build del proyecto ya en ejecución.',
+    'marked_as_failed' => 'Build %d falló debido a timeout.',
+
+    // Builder
+    'missing_phpci_yml' => 'Este proyecto no contiene el archivo phpci.yml o está vacío.',
+    'build_success' => 'BUILD EXITOSO',
+    'build_failed' => 'BUILD FALLIDO',
+    'removing_build' => 'Eliminando Build.',
+    'exception' => 'Excepción: ',
+    'could_not_create_working' => 'Imposible crear copia de trabajo.',
+    'working_copy_created' => 'Copia de trabajo creada: %s',
+    'looking_for_binary' => 'Buscando binario: %s',
+    'found_in_path' => 'Encontrado en %s: %s',
+    'running_plugin' => 'EJECUTANDO PLUGIN: %s',
+    'plugin_success' => 'PLUGIN: EXITO',
+    'plugin_failed' => 'PLUGIN: FALLÓ',
+    'plugin_missing' => 'No existe el plugin: %s',
+    'tap_version' => 'TapParser únicamente soporta la verisón 13 de TAP',
+    'tap_error' => 'Cadena de caracteres TAP inválida, el número de tests no coincide con la cuenta de tests declarada.',
+
+    // Build Plugins:
+    'no_tests_performed' => 'No se ejecutaron tests.',
+    'could_not_find' => 'No se encontró %s',
+    'no_campfire_settings' => 'No se especificaron parámetros de conexión para el plugin Campfire',
+    'failed_to_wipe' => 'Imposible eliminar directorio existente %s antes de copiarlo',
+    'passing_build' => 'Build Exitoso',
+    'failing_build' => 'Build Fallido',
+    'log_output' => 'Log de Salida: ',
+    'n_emails_sent' => '%d emails enviados.',
+    'n_emails_failed' => '%d emails no pudieron ser enviados.',
+    'unable_to_set_env' => 'Imposible setear variable de entorno',
+    'tag_created' => 'Tag creado por PHPCI: %s',
+    'x_built_at_x' => 'Build de %PROJECT_TITLE% en %BUILD_URI%',
+    'hipchat_settings' => 'Por favor, definir room y authToken para el plugin hipchat_notify',
+    'irc_settings' => 'Debes configurar un servidor, room y apodo.',
+    'invalid_command' => 'Comando inválido',
+    'import_file_key' => 'Sentencia de importación debe contener una llave \'file\'',
+    'cannot_open_import' => 'Imposible abrir archivo de importación SQL: %s',
+    'unable_to_execute' => 'Imposible ejecutar archivo SQL',
+    'phar_internal_error' => 'Error interno en plugin Phar',
+    'build_file_missing' => 'El archivo de build especificado no existe.',
+    'property_file_missing' => 'El archivo de propiedades especificado no existe.',
+    'could_not_process_report' => 'Imposible procesar el reporte generado por la herramienta.',
+    'shell_not_enabled' => 'El plugin shell no está habilitado. Por favor, habilitalo desde config.yml.'
+);

From 9d4116e3c95e782e127de4a24121af29480b1775 Mon Sep 17 00:00:00 2001
From: Adirelle 
Date: Tue, 3 Mar 2015 20:10:55 +0100
Subject: [PATCH 173/329] Reworked TapParser to be compliant and more robust.

Added another test case from #571.

Updated the output of TapParser::processTestLine.

Broke TapParser::parse down in simpler methods.

TapParser: ignore leading garbage and properly complain on missing TAP log.

TapParser: detect and report duplicated TAP log.

TapParser: got rid of the "test" and "suite" values.

They are only available with PHPUnit.

TapParser: append the message from yaml diagnostic to existing message.

Reworked the dispaly of test results.

PHPUnit plugin: pretty print test data.
---
 PHPCI/Languages/lang.da.php               |  10 +-
 PHPCI/Languages/lang.de.php               |  10 +-
 PHPCI/Languages/lang.el.php               |  10 +-
 PHPCI/Languages/lang.en.php               |  10 +-
 PHPCI/Languages/lang.fr.php               |  10 +-
 PHPCI/Languages/lang.it.php               |  10 +-
 PHPCI/Languages/lang.nl.php               |  10 +-
 PHPCI/Languages/lang.pl.php               |  10 +-
 PHPCI/Languages/lang.ru.php               |  10 +-
 PHPCI/Languages/lang.uk.php               |  10 +-
 PHPCI/Plugin/Util/TapParser.php           | 249 ++++++++++++++++------
 Tests/PHPCI/Plugin/Util/TapParserTest.php | 240 ++++++++++++++++++++-
 public/assets/css/AdminLTE-custom.css     |   9 +-
 public/assets/js/build-plugins/phpunit.js |  94 ++++++--
 14 files changed, 587 insertions(+), 105 deletions(-)

diff --git a/PHPCI/Languages/lang.da.php b/PHPCI/Languages/lang.da.php
index 4e61c3db..883e52b0 100644
--- a/PHPCI/Languages/lang.da.php
+++ b/PHPCI/Languages/lang.da.php
@@ -194,14 +194,20 @@ Services sektionen under dit Bitbucket-repository.',
     'end' => 'Slut',
     'from' => 'Fra',
     'to' => 'Til',
-    'suite' => 'Suite',
-    'test' => 'Test',
     'result' => 'Resultat',
     'ok' => 'OK',
     'took_n_seconds' => 'Tog %d sekunder',
     'build_created' => 'Build Oprettet',
     'build_started' => 'Build Startet',
     'build_finished' => 'Build Afsluttet',
+    'test_message' => 'Message',
+    'test_no_message' => 'No message',
+    'test_success' => 'Succesfull: %d',
+    'test_fail' => 'Failures: %d',
+    'test_skipped' => 'Skipped: %d',
+    'test_error' => 'Errors: %d',
+    'test_todo' => 'Todos: %d',
+    'test_total' => '%d test(s)',
 
     // Users
     'name' => 'Navn',
diff --git a/PHPCI/Languages/lang.de.php b/PHPCI/Languages/lang.de.php
index a04e40e1..62504310 100644
--- a/PHPCI/Languages/lang.de.php
+++ b/PHPCI/Languages/lang.de.php
@@ -192,14 +192,20 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab
     'end' => 'Ende',
     'from' => 'Von',
     'to' => 'Bis',
-    'suite' => 'Suite',
-    'test' => 'Test',
     'result' => 'Resultat',
     'ok' => 'OK',
     'took_n_seconds' => 'Benötigte %d Sekunden',
     'build_created' => 'Build erstellt',
     'build_started' => 'Build gestartet',
     'build_finished' => 'Build abgeschlossen',
+    'test_message' => 'Message',
+    'test_no_message' => 'No message',
+    'test_success' => 'Succesfull: %d',
+    'test_fail' => 'Failures: %d',
+    'test_skipped' => 'Skipped: %d',
+    'test_error' => 'Errors: %d',
+    'test_todo' => 'Todos: %d',
+    'test_total' => '%d test(s)',
 
     // Users
     'name' => 'Name',
diff --git a/PHPCI/Languages/lang.el.php b/PHPCI/Languages/lang.el.php
index 4b1e82ca..5afc6593 100644
--- a/PHPCI/Languages/lang.el.php
+++ b/PHPCI/Languages/lang.el.php
@@ -194,14 +194,20 @@ Services του Bitbucket αποθετηρίου σας.',
     'end' => 'Τέλος',
     'from' => 'Από',
     'to' => 'Προς',
-    'suite' => 'Σουίτα',
-    'test' => 'Τέστ',
     'result' => 'Αποτέλεσμα',
     'ok' => 'ΟΚ',
     'took_n_seconds' => 'Χρειάστηκαν %d δευτερόλεπτα',
     'build_created' => 'Η κατασκευή δημιουργήθηκε',
     'build_started' => 'Η κατασκευή άρχισε',
     'build_finished' => 'Η κατασκευή ολοκληρώθηκε',
+    'test_message' => 'Message',
+    'test_no_message' => 'No message',
+    'test_success' => 'Succesfull: %d',
+    'test_fail' => 'Failures: %d',
+    'test_skipped' => 'Skipped: %d',
+    'test_error' => 'Errors: %d',
+    'test_todo' => 'Todos: %d',
+    'test_total' => '%d test(s)',
 
     // Users
     'name' => 'Όνομα',
diff --git a/PHPCI/Languages/lang.en.php b/PHPCI/Languages/lang.en.php
index b23eff7b..393ef584 100644
--- a/PHPCI/Languages/lang.en.php
+++ b/PHPCI/Languages/lang.en.php
@@ -198,14 +198,20 @@ PHPCI',
     'end' => 'End',
     'from' => 'From',
     'to' => 'To',
-    'suite' => 'Suite',
-    'test' => 'Test',
     'result' => 'Result',
     'ok' => 'OK',
     'took_n_seconds' => 'Took %d seconds',
     'build_created' => 'Build Created',
     'build_started' => 'Build Started',
     'build_finished' => 'Build Finished',
+    'test_message' => 'Message',
+    'test_no_message' => 'No message',
+    'test_success' => 'Succesfull: %d',
+    'test_fail' => 'Failures: %d',
+    'test_skipped' => 'Skipped: %d',
+    'test_error' => 'Errors: %d',
+    'test_todo' => 'Todos: %d',
+    'test_total' => '%d test(s)',
 
     // Users
     'name' => 'Name',
diff --git a/PHPCI/Languages/lang.fr.php b/PHPCI/Languages/lang.fr.php
index 7be361fc..6965cb06 100644
--- a/PHPCI/Languages/lang.fr.php
+++ b/PHPCI/Languages/lang.fr.php
@@ -195,14 +195,20 @@ PHPCI',
     'end' => 'Fin',
     'from' => 'À partir de',
     'to' => 'jusque',
-    'suite' => 'Suite',
-    'test' => 'Test',
     'result' => 'Resultat',
     'ok' => 'OK',
     'took_n_seconds' => 'Exécuté en %d secondes',
     'build_created' => 'Build créé',
     'build_started' => 'Build démarré',
     'build_finished' => 'Build terminé',
+    'test_message' => 'Message',
+    'test_no_message' => 'Pas de message',
+    'test_success' => 'Réussi(s): %d',
+    'test_fail' => 'Echec(s): %d',
+    'test_skipped' => 'Passé(s): %d',
+    'test_error' => 'Erreurs: %d',
+    'test_todo' => 'Todos: %d',
+    'test_total' => '%d test(s)',
 
     // Users
     'name' => 'Nom',
diff --git a/PHPCI/Languages/lang.it.php b/PHPCI/Languages/lang.it.php
index a8a3e13c..db6b23fc 100644
--- a/PHPCI/Languages/lang.it.php
+++ b/PHPCI/Languages/lang.it.php
@@ -197,14 +197,20 @@ PHPCI',
     'end' => 'Finisci',
     'from' => 'Da',
     'to' => 'A',
-    'suite' => 'Suite',
-    'test' => 'Test',
     'result' => 'Risultati',
     'ok' => 'OK',
     'took_n_seconds' => 'Sono stati impiegati %d seconds',
     'build_created' => 'Build Creata',
     'build_started' => 'Build Avviata',
     'build_finished' => 'Build Terminata',
+    'test_message' => 'Message',
+    'test_no_message' => 'No message',
+    'test_success' => 'Succesfull: %d',
+    'test_fail' => 'Failures: %d',
+    'test_skipped' => 'Skipped: %d',
+    'test_error' => 'Errors: %d',
+    'test_todo' => 'Todos: %d',
+    'test_total' => '%d test(s)',
 
     // Users
     'name' => 'Nome',
diff --git a/PHPCI/Languages/lang.nl.php b/PHPCI/Languages/lang.nl.php
index 29e8b0f8..38e9466c 100644
--- a/PHPCI/Languages/lang.nl.php
+++ b/PHPCI/Languages/lang.nl.php
@@ -195,14 +195,20 @@ Services sectie van je Bitbucket repository toegevoegd worden.',
     'end' => 'Einde',
     'from' => 'Van',
     'to' => 'Tot',
-    'suite' => 'Suite',
-    'test' => 'Test',
     'result' => 'Resultaat',
     'ok' => 'OK',
     'took_n_seconds' => 'Duurde %d seconden',
     'build_created' => 'Build aangemaakt',
     'build_started' => 'Build gestart',
     'build_finished' => 'Build beëindigd',
+    'test_message' => 'Message',
+    'test_no_message' => 'No message',
+    'test_success' => 'Succesfull: %d',
+    'test_fail' => 'Failures: %d',
+    'test_skipped' => 'Skipped: %d',
+    'test_error' => 'Errors: %d',
+    'test_todo' => 'Todos: %d',
+    'test_total' => '%d test(s)',
 
     // Users
     'name' => 'Naam',
diff --git a/PHPCI/Languages/lang.pl.php b/PHPCI/Languages/lang.pl.php
index 816eb009..b4f8430c 100644
--- a/PHPCI/Languages/lang.pl.php
+++ b/PHPCI/Languages/lang.pl.php
@@ -198,14 +198,20 @@ Services repozytoria Bitbucket.',
     'end' => 'Koniec',
     'from' => 'Od',
     'to' => 'Do',
-    'suite' => 'Zestaw ',
-    'test' => 'Test',
     'result' => 'Wynik',
     'ok' => 'OK',
     'took_n_seconds' => 'Zajęło %d sekund',
     'build_created' => 'Budowanie Stworzone',
     'build_started' => 'Budowanie Rozpoczęte',
     'build_finished' => 'Budowanie Zakończone',
+    'test_message' => 'Message',
+    'test_no_message' => 'No message',
+    'test_success' => 'Succesfull: %d',
+    'test_fail' => 'Failures: %d',
+    'test_skipped' => 'Skipped: %d',
+    'test_error' => 'Errors: %d',
+    'test_todo' => 'Todos: %d',
+    'test_total' => '%d test(s)',
 
     // Users
     'name' => 'Nazwa',
diff --git a/PHPCI/Languages/lang.ru.php b/PHPCI/Languages/lang.ru.php
index 44ed1550..931c8910 100644
--- a/PHPCI/Languages/lang.ru.php
+++ b/PHPCI/Languages/lang.ru.php
@@ -193,14 +193,20 @@ PHPCI',
     'end' => 'Конец',
     'from' => 'Из',
     'to' => 'В',
-    'suite' => 'Комплект',
-    'test' => 'Тест',
     'result' => 'Результат',
     'ok' => 'OK',
     'took_n_seconds' => 'Заняло секунд: %d',
     'build_created' => 'Сборка создана',
     'build_started' => 'Сборка запущена',
     'build_finished' => 'Сборка окончена',
+    'test_message' => 'Message',
+    'test_no_message' => 'No message',
+    'test_success' => 'Succesfull: %d',
+    'test_fail' => 'Failures: %d',
+    'test_skipped' => 'Skipped: %d',
+    'test_error' => 'Errors: %d',
+    'test_todo' => 'Todos: %d',
+    'test_total' => '%d test(s)',
 
     // Users
     'name' => 'Имя',
diff --git a/PHPCI/Languages/lang.uk.php b/PHPCI/Languages/lang.uk.php
index 3e96459e..b080c65a 100644
--- a/PHPCI/Languages/lang.uk.php
+++ b/PHPCI/Languages/lang.uk.php
@@ -195,14 +195,20 @@ PHPCI',
     'end' => 'Кінець',
     'from' => 'Від',
     'to' => 'До',
-    'suite' => 'Комплект',
-    'test' => 'Тест',
     'result' => 'Результат',
     'ok' => 'OK',
     'took_n_seconds' => 'Зайняло %d секунд',
     'build_created' => 'Збірка створена',
     'build_started' => 'Збірка розпочата',
     'build_finished' => 'Збірка завершена',
+    'test_message' => 'Message',
+    'test_no_message' => 'No message',
+    'test_success' => 'Succesfull: %d',
+    'test_fail' => 'Failures: %d',
+    'test_skipped' => 'Skipped: %d',
+    'test_error' => 'Errors: %d',
+    'test_todo' => 'Todos: %d',
+    'test_total' => '%d test(s)',
 
     // Users
     'name' => 'Ім’я',
diff --git a/PHPCI/Plugin/Util/TapParser.php b/PHPCI/Plugin/Util/TapParser.php
index 57b92b55..18772a6a 100644
--- a/PHPCI/Plugin/Util/TapParser.php
+++ b/PHPCI/Plugin/Util/TapParser.php
@@ -2,7 +2,9 @@
 
 namespace PHPCI\Plugin\Util;
 
+use Exception;
 use PHPCI\Helper\Lang;
+use Symfony\Component\Yaml\Yaml;
 
 /**
  * Processes TAP format strings into usable test result data.
@@ -10,18 +12,41 @@ use PHPCI\Helper\Lang;
  */
 class TapParser
 {
-    const TEST_COUNTS_PATTERN = '/([0-9]+)\.\.([0-9]+)/';
-    const TEST_LINE_PATTERN = '/(ok|not ok)\s+[0-9]+\s+\-\s+([^\n]+)::([^\n]+)/';
-    const TEST_MESSAGE_PATTERN = '/message\:\s+\'([^\']+)\'/';
-    const TEST_COVERAGE_PATTERN = '/Generating code coverage report/';
-    const TEST_SKIP_PATTERN = '/ok\s+[0-9]+\s+\-\s+#\s+SKIP/';
+    const TEST_COUNTS_PATTERN = '/^\d+\.\.(\d+)/';
+    const TEST_LINE_PATTERN = '/^(ok|not ok)(?:\s+\d+)?(?:\s+\-)?\s*(.*?)(?:\s*#\s*(skip|todo)\s*(.*))?\s*$/i';
+    const TEST_YAML_START = '/^(\s*)---/';
+    const TEST_DIAGNOSTIC = '/^#/';
 
     /**
      * @var string
      */
     protected $tapString;
+
+    /**
+     * @var int
+     */
     protected $failures = 0;
 
+    /**
+     * @var array
+     */
+    protected $lines;
+
+    /**
+     * @var integer
+     */
+    protected $lineNumber;
+
+    /**
+     * @var integer
+     */
+    protected $testCount;
+
+    /**
+     * @var array
+     */
+    protected $results;
+
     /**
      * Create a new TAP parser for a given string.
      * @param string $tapString The TAP format string to be parsed.
@@ -38,81 +63,175 @@ class TapParser
     {
         // Split up the TAP string into an array of lines, then
         // trim all of the lines so there's no leading or trailing whitespace.
-        $lines = explode("\n", $this->tapString);
-        $lines = array_map(function ($line) {
-            return trim($line);
-        }, $lines);
+        $this->lines = array_map('rtrim', explode("\n", $this->tapString));
+        $this->lineNumber = 0;
 
-        // Check TAP version:
-        $versionLine = array_shift($lines);
+        $this->testCount = false;
+        $this->results = array();
 
-        if ($versionLine != 'TAP version 13') {
-            throw new \Exception(Lang::get('tap_version'));
+        $header = $this->findTapLog();
+
+        $line = $this->nextLine();
+        if ($line === $header) {
+            throw new Exception("Duplicated TAP log, please check the configration.");
         }
 
-        if (isset($lines[count($lines) - 1]) && preg_match(self::TEST_COVERAGE_PATTERN, $lines[count($lines) - 1])) {
-            array_pop($lines);
-            if ($lines[count($lines) - 1] == "") {
-                array_pop($lines);
+        while ($line !== false && ($this->testCount === false || count($this->results) < $this->testCount)) {
+            $this->parseLine($line);
+            $line = $this->nextLine();
+        }
+
+        if (count($this->results) !== $this->testCount) {
+            throw new Exception(Lang::get('tap_error'));
+        }
+
+        return $this->results;
+    }
+
+    /** Looks for the start of the TAP log in the string.
+     *
+     * @return string The TAP header line.
+     *
+     * @throws Exception if no TAP log is found or versions mismatch.
+     */
+    protected function findTapLog()
+    {
+        // Look for the beggning of the TAP output
+        do {
+            $header = $this->nextLine();
+        } while ($header !== false && substr($header, 0, 12) !== 'TAP version ');
+
+        //
+        if ($header === false) {
+            throw new Exception('No TAP log found, please check the configuration.');
+        } elseif ($header !== 'TAP version 13') {
+            throw new Exception(Lang::get('tap_version'));
+        }
+
+        return $header;
+    }
+
+    /** Fetch the next line.
+     *
+     * @return string|false The next line or false if the end has been reached.
+     */
+    protected function nextLine()
+    {
+        if ($this->lineNumber < count($this->lines)) {
+            return $this->lines[$this->lineNumber++];
+        }
+        return false;
+    }
+
+    /** Parse a single line.
+     *
+     * @param string $line
+     */
+    protected function parseLine($line)
+    {
+        if (preg_match(self::TEST_COUNTS_PATTERN, $line, $matches)) {
+            $this->testCount = intval($matches[1]);
+
+        } elseif (preg_match(self::TEST_DIAGNOSTIC, $line)) {
+            return;
+
+        } elseif (preg_match(self::TEST_LINE_PATTERN, $line, $matches)) {
+            $this->results[] = $this->processTestLine(
+                $matches[1],
+                isset($matches[2]) ? $matches[2] : '',
+                isset($matches[3]) ? $matches[3] : null,
+                isset($matches[4]) ? $matches[4] : null
+            );
+
+        } elseif (preg_match(self::TEST_YAML_START, $line, $matches)) {
+            $diagnostic = $this->processYamlBlock($matches[1]);
+            $test = array_pop($this->results);
+            if (isset($test['message'], $diagnostic['message'])) {
+                $test['message'] .= PHP_EOL . $diagnostic['message'];
+                unset($diagnostic['message']);
             }
+            $this->results[] = array_replace($test, $diagnostic);
+
+        } else {
+            throw new Exception(sprintf('Incorrect TAP data, line %d: %s', $this->lineNumber, $line));
         }
-
-        $matches = array();
-        $totalTests = 0;
-        if (preg_match(self::TEST_COUNTS_PATTERN, $lines[0], $matches)) {
-            array_shift($lines);
-            $totalTests = (int) $matches[2];
-        }
-
-        if (isset($lines[count($lines) - 1]) &&
-            preg_match(self::TEST_COUNTS_PATTERN, $lines[count($lines) - 1], $matches)) {
-            array_pop($lines);
-            $totalTests = (int) $matches[2];
-        }
-
-        $rtn = $this->processTestLines($lines);
-
-        if ($totalTests != count($rtn)) {
-            throw new \Exception(Lang::get('tap_error'));
-        }
-
-        return $rtn;
     }
 
     /**
-     * Process the individual test lines within a TAP string.
-     * @param $lines
+     * Process an individual test line.
+     *
+     * @param string $result
+     * @param string $message
+     * @param string $directive
+     * @param string $reason
+     *
      * @return array
      */
-    protected function processTestLines($lines)
+    protected function processTestLine($result, $message, $directive, $reason)
     {
-        $rtn = array();
+        $test = array(
+            'pass'     => true,
+            'message'  => $message,
+            'severity' => 'success',
+        );
 
-        foreach ($lines as $line) {
-            $matches = array();
-
-            if (preg_match(self::TEST_LINE_PATTERN, $line, $matches)) {
-                $ok = ($matches[1] == 'ok' ? true : false);
-
-                if (!$ok) {
-                    $this->failures++;
-                }
-
-                $item = array(
-                    'pass' => $ok,
-                    'suite' => $matches[2],
-                    'test' => $matches[3],
-                );
-
-                $rtn[] = $item;
-            } elseif (preg_match(self::TEST_SKIP_PATTERN, $line, $matches)) {
-                $rtn[] = array('message' => 'SKIP');
-            } elseif (preg_match(self::TEST_MESSAGE_PATTERN, $line, $matches)) {
-                $rtn[count($rtn) - 1]['message'] = $matches[1];
-            }
+        if ($result !== 'ok') {
+            $test['pass'] = false;
+            $test['severity'] = substr($message, 0, 6) === 'Error:' ? 'error' : 'fail';
+            $this->failures++;
         }
 
-        return $rtn;
+        if ($directive) {
+            $test = $this->processDirective($test, $directive, $reason);
+        }
+
+        return $test;
+    }
+
+    /** Process an indented Yaml block.
+     *
+     * @param string $indent The block indentation to ignore.
+     *
+     * @return array The processed Yaml content.
+     */
+    protected function processYamlBlock($indent)
+    {
+        $startLine = $this->lineNumber+1;
+        $endLine = $indent.'...';
+        $yamlLines = array();
+        do {
+            $line = $this->nextLine();
+            if ($line === false) {
+                throw new Exception(Lang::get('tap_error_endless_yaml', $startLine));
+            } elseif ($line === $endLine) {
+                break;
+            }
+            $yamlLines[] = substr($line, strlen($indent));
+
+        } while (true);
+
+        return Yaml::parse(join("\n", $yamlLines));
+    }
+
+    /** Process a TAP directive
+     *
+     * @param array $test
+     * @param string $directive
+     * @param string $reason
+     * @return array
+     */
+    protected function processDirective($test, $directive, $reason)
+    {
+        $test['severity'] = strtolower($directive) === 'skip' ? 'skipped' : 'todo';
+
+        if (!empty($reason)) {
+            if (!empty($test['message'])) {
+                $test['message'] .= ', '.$test['severity'].': ';
+            }
+            $test['message'] .= $reason;
+        }
+
+        return $test;
     }
 
     /**
diff --git a/Tests/PHPCI/Plugin/Util/TapParserTest.php b/Tests/PHPCI/Plugin/Util/TapParserTest.php
index c4438b79..75c04bfa 100644
--- a/Tests/PHPCI/Plugin/Util/TapParserTest.php
+++ b/Tests/PHPCI/Plugin/Util/TapParserTest.php
@@ -5,22 +5,254 @@ use PHPCI\Plugin\Util\TapParser;
 
 class TapParserTest extends \PHPUnit_Framework_TestCase
 {
-    public function testSkipped()
+    public function testSimple()
+    {
+        $content = <<parse();
+
+        $this->assertEquals(array(
+            array('pass' => true, 'severity' => 'success', 'message' => 'SomeTest::testAnother'),
+            array('pass' => false, 'severity' => 'fail', 'message' => ''),
+        ), $result);
+
+        $this->assertEquals(1, $parser->getTotalFailures());
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessageRegExp /No TAP/
+     */
+    public function testNoTapData()
+    {
+        $content = <<parse();
+    }
+
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessageRegExp /Duplicated TAP/
+     */
+    public function testDuplicateOutput()
+    {
+        $content = <<parse();
+    }
+
+    public function testSuiteAndTest()
     {
         $content = <<parse();
+
+        $this->assertEquals(array(
+            array('pass' => true, 'severity' => 'success', 'message' => 'SomeTest::testAnother',),
+            array('pass' => false, 'severity' => 'fail', 'message' => 'Failure: SomeTest::testAnother'),
+            array('pass' => false, 'severity' => 'error', 'message' => 'Error: SomeTest::testAnother'),
+        ), $result);
+
+        $this->assertEquals(2, $parser->getTotalFailures());
+    }
+
+
+    public function testSkipped()
+    {
+        $content = <<parse();
+
+        $this->assertEquals(array(
+            array('pass' => true, 'severity' => 'skipped', 'message' => ''),
+            array('pass' => true, 'severity' => 'skipped', 'message' => 'foobar'),
+            array('pass' => true, 'severity' => 'skipped', 'message' => 'foo, skipped: bar'),
+        ), $result);
+
+        $this->assertEquals(0, $parser->getTotalFailures());
+    }
+
+    public function testTodo()
+    {
+        $content = <<parse();
+
+        $this->assertEquals(array(
+            array('pass' => true, 'severity' => 'todo', 'message' => 'SomeTest::testAnother, todo: really implement this test'),
+            array('pass' => true, 'severity' => 'todo', 'message' => 'really implement this test'),
+            array('pass' => true, 'severity' => 'todo', 'message' => 'this is a message, todo: really implement this test'),
+            array('pass' => true, 'severity' => 'todo', 'message' => ''),
+        ), $result);
+
+        $this->assertEquals(0, $parser->getTotalFailures());
+    }
+
+    public function testYamlDiagnostic()
+    {
+        // From https://phpunit.de/manual/current/en/logging.html#logging.tap
+        $content = <<parse();
+
+        $this->assertEquals(array(
+            array(
+                'pass'     => false,
+                'severity' => 'fail',
+                'message'  => 'FOO' . PHP_EOL . 'BAR',
+            ),
+        ), $result);
+
+        $this->assertEquals(1, $parser->getTotalFailures());
+    }
+
+    public function testFailureAndError()
+    {
+        // From https://phpunit.de/manual/current/en/logging.html#logging.tap
+        $content = <<parse();
 
         $this->assertEquals(array(
-            array('pass' => true, 'suite' => 'SomeTest', 'test' => 'testAnother'),
-            array('message' => 'SKIP'),
+            array(
+                'pass'     => false,
+                'severity' => 'fail',
+                'message'  => 'Failure: testFailure::FailureErrorTest',
+            ),
+            array(
+                'pass'     => false,
+                'severity' => 'error',
+                'message'  => 'Error: testError::FailureErrorTest',
+            )
         ), $result);
 
+        $this->assertEquals(2, $parser->getTotalFailures());
+    }
+
+    /**
+     * @expectedException \Exception
+     */
+    public function testGarbage()
+    {
+        $content = "Garbage !";
+
+        $parser = new TapParser($content);
+        $parser->parse();
+    }
+
+    /**
+     * @expectedException \Exception
+     */
+    public function testInvalidTestCount()
+    {
+        $content = <<parse();
+    }
+
+    /**
+     * @expectedException \Exception
+     */
+    public function testEndlessYaml()
+    {
+        $content = <<parse();
+    }
+
+    public function testCodeception()
+    {
+        $content = <<< TAP
+TAP version 13
+ok 1 - try to access the dashboard as a guest (Auth/GuestAccessDashboardAndRedirectCept)
+ok 2 - see the login page (Auth/SeeLoginCept)
+ok 3 - click forgot password and see the email form (Auth/SeeLoginForgotPasswordCept)
+ok 4 - see powered by runmybusiness branding (Auth/ShouldSeePoweredByBrandingCept)
+ok 5 - submit invalid credentials (Auth/SubmitLoginAndFailCept)
+ok 6 - submit valid credentials and see the dashboard (Auth/SubmitLoginAndSucceedCept)
+1..6
+TAP;
+
+        $parser = new TapParser($content);
+        $result = $parser->parse();
+
+        $this->assertEquals(
+            array(
+                array('pass' => true, 'severity' => 'success', 'message' => 'try to access the dashboard as a guest (Auth/GuestAccessDashboardAndRedirectCept)'),
+                array('pass' => true, 'severity' => 'success', 'message' => 'see the login page (Auth/SeeLoginCept)'),
+                array('pass' => true, 'severity' => 'success', 'message' => 'click forgot password and see the email form (Auth/SeeLoginForgotPasswordCept)'),
+                array('pass' => true, 'severity' => 'success', 'message' => 'see powered by runmybusiness branding (Auth/ShouldSeePoweredByBrandingCept)'),
+                array('pass' => true, 'severity' => 'success', 'message' => 'submit invalid credentials (Auth/SubmitLoginAndFailCept)'),
+                array('pass' => true, 'severity' => 'success', 'message' => 'submit valid credentials and see the dashboard (Auth/SubmitLoginAndSucceedCept)'),
+            ),
+            $result
+        );
+
         $this->assertEquals(0, $parser->getTotalFailures());
+
     }
 }
diff --git a/public/assets/css/AdminLTE-custom.css b/public/assets/css/AdminLTE-custom.css
index b95f7b70..e37a0f48 100644
--- a/public/assets/css/AdminLTE-custom.css
+++ b/public/assets/css/AdminLTE-custom.css
@@ -84,4 +84,11 @@
     padding: 0;
     font-size: inherit;
     line-height: inherit;
-}
\ No newline at end of file
+}
+
+#phpunit-data th div { margin: 0 0.5em; }
+#phpunit-data .success td { background: none; color: #00a65a; }
+#phpunit-data .fail td { background: none; color: #f56954; }
+#phpunit-data .error td { background: none; color: #f56954; }
+#phpunit-data .skipped td { background: none; color: #e08e0b; }
+#phpunit-data .todo td { background: none; color: #00c0ef; }
diff --git a/public/assets/js/build-plugins/phpunit.js b/public/assets/js/build-plugins/phpunit.js
index 4a55d905..66f010a1 100644
--- a/public/assets/js/build-plugins/phpunit.js
+++ b/public/assets/js/build-plugins/phpunit.js
@@ -6,6 +6,13 @@ var phpunitPlugin = ActiveBuild.UiPlugin.extend({
     displayOnUpdate: false,
     box: true,
     rendered: false,
+    statusMap: {
+        success : 'ok',
+        fail: 'remove',
+        error: 'warning-sign',
+        todo: 'info-sign',
+        skipped: 'exclamation-sign'
+    },
 
     register: function() {
         var self = this;
@@ -21,6 +28,11 @@ var phpunitPlugin = ActiveBuild.UiPlugin.extend({
                 query();
             }
         });
+
+        $(document).on('click', '#phpunit-data .test-toggle', function(ev) {
+            var input = $(ev.target);
+            $('#phpunit-data tbody ' + input.data('target')).toggle(input.prop('checked'));
+        });
     },
 
     render: function() {
@@ -28,7 +40,7 @@ var phpunitPlugin = ActiveBuild.UiPlugin.extend({
         return $('
    
 			
         
         
 
     
    
 	#getId(), 6, '0', STR_PAD_LEFT); ?>getCreated()->format('Y-m-d H:i:s'); ?>
 	
         getProject())) {
diff --git a/PHPCI/View/Project/view.phtml b/PHPCI/View/Project/view.phtml
index 900349c8..2e79c017 100644
--- a/PHPCI/View/Project/view.phtml
+++ b/PHPCI/View/Project/view.phtml
@@ -42,6 +42,7 @@
 			
    
 			
    
 				
 				
 				
 				
    ' +
             '' +
             '' +
-            '   ' +
+            '   ' +
             '' +
             '
    '+Lang.get('test')+''+Lang.get('test_message')+'
    ');
     },
@@ -43,7 +55,9 @@ var phpunitPlugin = ActiveBuild.UiPlugin.extend({
         this.lastData = e.queryData;
 
         var tests = this.lastData[0].meta_value;
+        var thead = $('#phpunit-data thead tr');
         var tbody = $('#phpunit-data tbody');
+        thead.empty().append(''+Lang.get('test_message')+'');
         tbody.empty();
 
         if (tests.length == 0) {
@@ -51,24 +65,74 @@ var phpunitPlugin = ActiveBuild.UiPlugin.extend({
             return;
         }
 
+        var counts = { success: 0, fail: 0, error: 0, skipped: 0, todo: 0 }, total = 0;
+
         for (var i in tests) {
-
-            var row = $('' +
-                ''+tests[i].suite+'' +
-                '::'+tests[i].test+'
    ' +
-                ''+(tests[i].message || '')+'' +
-                '');
-
-            if (!tests[i].pass) {
-                row.addClass('danger');
-            } else {
-                row.addClass('success');
-            }
-
-            tbody.append(row);
+            var severity = tests[i].severity || 'success',
+                message = tests[i].message || ('' + Lang.get('test_no_message') + '');
+            counts[severity]++;
+            total++;
+            tbody.append(
+                '' +
+                    '' +
+                        '
    ' + message + '
    ' +
+                        (tests[i].data ? '
    ' + this.repr(tests[i].data) + '
    ' : '') +
+                    '' +
+                ''
+            );
         }
 
+        var checkboxes = $('');
+        thead.append(checkboxes).append('' + Lang.get('test_total', total) + '');
+
+        for (var key in counts) {
+            var count = counts[key];
+            if(count > 0) {
+                checkboxes.append(
+                    '
     ' +
+                    Lang.get('test_'+key, count)+ '
     '
+                );
+            }
+        }
+
+        tbody.find('.success').hide();
+
         $('#build-phpunit-errors').show();
+    },
+
+    repr: function(data)
+    {
+        switch(typeof(data)) {
+            case 'boolean':
+                return '' + (data ? 'true' : 'false') + '';
+            case 'string':
+                return '"' + data + '"';
+            case 'undefined': case null:
+                return 'null';
+            case 'object':
+                var rows = [];
+                if(data instanceof Array) {
+                    for(var i in data) {
+                        rows.push('' + this.repr(data[i]) + ',');
+                    }
+                } else {
+                    for(var key in data) {
+                        rows.push(
+                            '' +
+                                '' + this.repr(key) + '' +
+                                '=>' +
+                                '' + this.repr(data[key]) + ',' +
+                            '');
+                    }
+                }
+                return '' +
+                        '' +
+                        rows.join('') +
+                        '' +
+                    '
    array(
    )
    ';
+        }
+        return '???';
     }
 });
 

From 01911f11aa7c2e20087aa139df25cc081eabf41c Mon Sep 17 00:00:00 2001
From: Tobias van Beek 
Date: Wed, 25 Mar 2015 11:10:47 +0100
Subject: [PATCH 174/329] Add the --recursive parameter to the git clone to get
 the submodules

---
 PHPCI/Model/Build/RemoteGitBuild.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/PHPCI/Model/Build/RemoteGitBuild.php b/PHPCI/Model/Build/RemoteGitBuild.php
index 80718011..5d0c9419 100644
--- a/PHPCI/Model/Build/RemoteGitBuild.php
+++ b/PHPCI/Model/Build/RemoteGitBuild.php
@@ -54,7 +54,7 @@ class RemoteGitBuild extends Build
     */
     protected function cloneByHttp(Builder $builder, $cloneTo)
     {
-        $cmd = 'git clone ';
+        $cmd = 'git clone --recursive ';
 
         $depth = $builder->getConfig('clone_depth');
 
@@ -84,7 +84,7 @@ class RemoteGitBuild extends Build
         }
 
         // Do the git clone:
-        $cmd = 'git clone ';
+        $cmd = 'git clone --recursive ';
 
         $depth = $builder->getConfig('clone_depth');
 

From 524341a50b33c47b6d7ba1983d8446da9e57a7f5 Mon Sep 17 00:00:00 2001
From: Angel Koilov 
Date: Fri, 27 Mar 2015 14:09:03 +0200
Subject: [PATCH 175/329] remove unnecessary code

---
 PHPCI/Plugin/Behat.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/PHPCI/Plugin/Behat.php b/PHPCI/Plugin/Behat.php
index 23686270..445d7191 100644
--- a/PHPCI/Plugin/Behat.php
+++ b/PHPCI/Plugin/Behat.php
@@ -98,7 +98,6 @@ class Behat implements \PHPCI\Plugin
 
         $lines = explode(PHP_EOL, $parts[1]);
 
-        $errorCount = 0;
         $storeFailures = false;
         $data = array();
 

From 731fd65453c7663129dc0175b208b61ce9e06d39 Mon Sep 17 00:00:00 2001
From: zviryatko 
Date: Sat, 28 Mar 2015 16:50:40 +0200
Subject: [PATCH 176/329] Change xmpp config and message files directory

---
 PHPCI/Plugin/Xmpp.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/PHPCI/Plugin/Xmpp.php b/PHPCI/Plugin/Xmpp.php
index 8614e208..add778cb 100644
--- a/PHPCI/Plugin/Xmpp.php
+++ b/PHPCI/Plugin/Xmpp.php
@@ -132,8 +132,8 @@ class XMPP implements \PHPCI\Plugin
      */
     public function findConfigFile()
     {
-        if (file_exists('.sendxmpprc')) {
-            if (md5(file_get_contents('.sendxmpprc')) !== md5($this->getConfigFormat())) {
+        if (file_exists($this->phpci->buildPath . '/.sendxmpprc')) {
+            if (md5(file_get_contents($this->phpci->buildPath . '/.sendxmpprc')) !== md5($this->getConfigFormat())) {
                 return null;
             }
 
@@ -165,9 +165,10 @@ class XMPP implements \PHPCI\Plugin
         /*
          * Try to build conf file
          */
+        $config_file = $this->phpci->buildPath . '/.sendxmpprc';
         if (is_null($this->findConfigFile())) {
-            file_put_contents('.sendxmpprc', $this->getConfigFormat());
-            chmod('.sendxmpprc', 0600);
+            file_put_contents($config_file, $this->getConfigFormat());
+            chmod($config_file, 0600);
         }
 
         /*
@@ -178,7 +179,7 @@ class XMPP implements \PHPCI\Plugin
             $tls = ' -t';
         }
 
-        $message_file = uniqid('xmppmessage');
+        $message_file = $this->phpci->buildPath . '/' . uniqid('xmppmessage');
         if ($this->buildMessage($message_file) === false) {
             return false;
         }
@@ -186,10 +187,10 @@ class XMPP implements \PHPCI\Plugin
         /*
          * Send XMPP notification for all recipients
          */
-        $cmd = $sendxmpp . "%s -f .sendxmpprc -m %s %s";
+        $cmd = $sendxmpp . "%s -f %s -m %s %s";
         $recipients = implode(' ', $this->recipients);
 
-        $success = $this->phpci->executeCommand($cmd, $tls, $message_file, $recipients);
+        $success = $this->phpci->executeCommand($cmd, $tls, $config_file, $message_file, $recipients);
 
         print $this->phpci->getLastOutput();
 

From f3c1a98cf10871eadd62bc461e4e02382384ba2f Mon Sep 17 00:00:00 2001
From: Adirelle 
Date: Wed, 25 Mar 2015 15:15:53 +0100
Subject: [PATCH 177/329] Detailed webhook responses.

Fixed docblocks.

Reworked WebhookController to enforce Json responses in ::handleAction.

Check the project type match the webhook.

When creating several builds, do not stop on first error.

Try to create every builds and report 'ok' if at least one succeeds.

CS fix.

Fixed Uses.

Fixed the types accepted by the git webhook.

Added some really basic test.
---
 PHPCI/Controller/WebhookController.php        | 378 ++++++++++--------
 .../Controller/WebhookControllerTest.php      |  41 ++
 2 files changed, 260 insertions(+), 159 deletions(-)
 create mode 100644 Tests/PHPCI/Controller/WebhookControllerTest.php

diff --git a/PHPCI/Controller/WebhookController.php b/PHPCI/Controller/WebhookController.php
index 78824ddb..e05cfbda 100644
--- a/PHPCI/Controller/WebhookController.php
+++ b/PHPCI/Controller/WebhookController.php
@@ -2,7 +2,7 @@
 /**
  * PHPCI - Continuous Integration for PHP
  *
- * @copyright    Copyright 2014, Block 8 Limited.
+ * @copyright    Copyright 2014-2015, Block 8 Limited.
  * @license      https://github.com/Block8/PHPCI/blob/master/LICENSE.md
  * @link         https://www.phptesting.org/
  */
@@ -11,31 +11,37 @@ namespace PHPCI\Controller;
 
 use b8;
 use b8\Store;
+use Exception;
 use PHPCI\BuildFactory;
+use PHPCI\Model\Project;
 use PHPCI\Service\BuildService;
+use PHPCI\Store\BuildStore;
+use PHPCI\Store\ProjectStore;
 
 /**
  * Webhook Controller - Processes webhook pings from BitBucket, Github, Gitlab, etc.
+ *
  * @author       Dan Cryer 
  * @author       Sami Tikka 
  * @author       Alex Russell 
+ * @author       Guillaume Perréal 
  * @package      PHPCI
  * @subpackage   Web
  */
-class WebhookController extends \PHPCI\Controller
+class WebhookController extends \b8\Controller
 {
     /**
-     * @var \PHPCI\Store\BuildStore
+     * @var BuildStore
      */
     protected $buildStore;
 
     /**
-     * @var \PHPCI\Store\ProjectStore
+     * @var ProjectStore
      */
     protected $projectStore;
 
     /**
-     * @var \PHPCI\Service\BuildService
+     * @var BuildService
      */
     protected $buildService;
 
@@ -49,194 +55,207 @@ class WebhookController extends \PHPCI\Controller
         $this->buildService = new BuildService($this->buildStore);
     }
 
+    /** Handle the action, Ensuring to return a JsonResponse.
+     *
+     * @param string $action
+     * @param mixed $actionParams
+     *
+     * @return \b8\Http\Response
+     */
+    public function handleAction($action, $actionParams)
+    {
+        $response = new b8\Http\Response\JsonResponse();
+        try {
+            $data = parent::handleAction($action, $actionParams);
+            if (isset($data['responseCode'])) {
+                $response->setResponseCode($data['responseCode']);
+                unset($data['responseCode']);
+            }
+            $response->setContent($data);
+        } catch (Exception $ex) {
+            $response->setResponseCode(500);
+            $response->setContent(array('status' => 'failed', 'error' => $ex->getMessage()));
+        }
+        return $response;
+    }
+
     /**
      * Called by Bitbucket POST service.
      */
-    public function bitbucket($project)
+    public function bitbucket($projectId)
     {
-        $response = new b8\Http\Response\JsonResponse();
-        $response->setContent(array('status' => 'ok'));
-
+        $project = $this->fetchProject($projectId, 'bitbucket');
         $payload = json_decode($this->getParam('payload'), true);
 
+        $results = array();
+        $status = 'failed';
         foreach ($payload['commits'] as $commit) {
             try {
                 $email = $commit['raw_author'];
                 $email = substr($email, 0, strpos($email, '>'));
                 $email = substr($email, strpos($email, '<') + 1);
 
-                $this->createBuild($project, $commit['raw_node'], $commit['branch'], $email, $commit['message']);
-            } catch (\Exception $ex) {
-                $response->setResponseCode(500);
-                $response->setContent(array('status' => 'failed', 'error' => $ex->getMessage()));
-                break;
+                $results[$commit['raw_node']] = $this->createBuild(
+                    $project,
+                    $commit['raw_node'],
+                    $commit['branch'],
+                    $email,
+                    $commit['message']
+                );
+                $status = 'ok';
+            } catch (Exception $ex) {
+                $results[$commit['raw_node']] = array('status' => 'failed', 'error' => $ex->getMessage());
             }
         }
 
-        return $response;
+        return array('status' => $status, 'commits' => $results);
     }
 
     /**
      * Called by POSTing to /webhook/git/?branch=&commit=
      *
-     * @param string $project
+     * @param string $projectId
      */
-    public function git($project)
+    public function git($projectId)
     {
-        $response = new b8\Http\Response\JsonResponse();
-        $response->setContent(array('status' => 'ok'));
-
-        $branch = $this->getParam('branch');
+        $project = $this->fetchProject($projectId, array('local', 'remote'));
+        $branch = $this->getParam('branch', $project->getBranch());
         $commit = $this->getParam('commit');
         $commitMessage = $this->getParam('message');
         $committer = $this->getParam('committer');
 
-        try {
-            if (empty($branch)) {
-                $branch = 'master';
-            }
-
-            if (empty($commit)) {
-                $commit = null;
-            }
-
-            if (empty($commitMessage)) {
-                $commitMessage = null;
-            }
-
-            if (empty($committer)) {
-                $committer = null;
-            }
-
-            $this->createBuild($project, $commit, $branch, $committer, $commitMessage);
-        } catch (\Exception $ex) {
-            $response->setResponseCode(500);
-            $response->setContent(array('status' => 'failed', 'error' => $ex->getMessage()));
-        }
-
-        return $response;
+        return $this->createBuild($project, $commit, $branch, $committer, $commitMessage);
     }
 
     /**
      * Called by Github Webhooks:
      */
-    public function github($project)
+    public function github($projectId)
     {
-        $response = new b8\Http\Response\JsonResponse();
-        $response->setContent(array('status' => 'ok'));
+        $project = $this->fetchProject($projectId, 'github');
 
         switch ($_SERVER['CONTENT_TYPE']) {
             case 'application/json':
                 $payload = json_decode(file_get_contents('php://input'), true);
                 break;
-
             case 'application/x-www-form-urlencoded':
                 $payload = json_decode($this->getParam('payload'), true);
                 break;
-
             default:
-                $response->setResponseCode(401);
-                $response->setContent(array('status' => 'failed', 'error' => 'Content type not supported.'));
-                return $response;
+                return array('status' => 'failed', 'error' => 'Content type not supported.', 'responseCode' => 401);
         }
 
         // Handle Pull Request web hooks:
         if (array_key_exists('pull_request', $payload)) {
-            return $this->githubPullRequest($project, $payload, $response);
+            return $this->githubPullRequest($project, $payload);
         }
 
         // Handle Push web hooks:
         if (array_key_exists('commits', $payload)) {
-            return $this->githubCommitRequest($project, $payload, $response);
+            return $this->githubCommitRequest($project, $payload);
         }
 
-        return $response;
+        return array('status' => 'ignored', 'message' => 'Unusable payload.');
     }
 
     /**
      * Handle the payload when Github sends a commit webhook.
-     * @param $project
+     *
+     * @param Project $project
      * @param array $payload
      * @param b8\Http\Response\JsonResponse $response
+     *
      * @return b8\Http\Response\JsonResponse
      */
-    protected function githubCommitRequest($project, array $payload, b8\Http\Response\JsonResponse $response)
+    protected function githubCommitRequest(Project $project, array $payload)
     {
         // Github sends a payload when you close a pull request with a
         // non-existant commit. We don't want this.
         if (array_key_exists('after', $payload) && $payload['after'] === '0000000000000000000000000000000000000000') {
-            return $response;
+            return array('status' => 'ignored');
         }
 
-        try {
-            if (isset($payload['commits']) && is_array($payload['commits'])) {
-                // If we have a list of commits, then add them all as builds to be tested:
+        if (isset($payload['commits']) && is_array($payload['commits'])) {
+            // If we have a list of commits, then add them all as builds to be tested:
 
-                foreach ($payload['commits'] as $commit) {
-                    if (!$commit['distinct']) {
-                        continue;
-                    }
+            $results = array();
+            $status = 'failed';
+            foreach ($payload['commits'] as $commit) {
+                if (!$commit['distinct']) {
+                    $results[$commit['id']] = array('status' => 'ignored');
+                    continue;
+                }
 
+                try {
                     $branch = str_replace('refs/heads/', '', $payload['ref']);
                     $committer = $commit['committer']['email'];
-                    $this->createBuild($project, $commit['id'], $branch, $committer, $commit['message']);
+                    $results[$commit['id']] = $this->createBuild(
+                        $project,
+                        $commit['id'],
+                        $branch,
+                        $committer,
+                        $commit['message']
+                    );
+                    $status = 'ok';
+                } catch (Exception $ex) {
+                    $results[$commit['id']] = array('status' => 'failed', 'error' => $ex->getMessage());
                 }
-            } elseif (substr($payload['ref'], 0, 10) == 'refs/tags/') {
-                // If we don't, but we're dealing with a tag, add that instead:
-                $branch = str_replace('refs/tags/', 'Tag: ', $payload['ref']);
-                $committer = $payload['pusher']['email'];
-                $message = $payload['head_commit']['message'];
-                $this->createBuild($project, $payload['after'], $branch, $committer, $message);
             }
-
-        } catch (\Exception $ex) {
-            $response->setResponseCode(500);
-            $response->setContent(array('status' => 'failed', 'error' => $ex->getMessage()));
-
+            return array('status' => $status, 'commits' => $results);
         }
 
-        return $response;
+        if (substr($payload['ref'], 0, 10) == 'refs/tags/') {
+            // If we don't, but we're dealing with a tag, add that instead:
+            $branch = str_replace('refs/tags/', 'Tag: ', $payload['ref']);
+            $committer = $payload['pusher']['email'];
+            $message = $payload['head_commit']['message'];
+            return $this->createBuild($project, $payload['after'], $branch, $committer, $message);
+        }
+
+        return array('status' => 'ignored', 'message' => 'Unusable payload.');
     }
 
     /**
      * Handle the payload when Github sends a Pull Request webhook.
-     * @param $projectId
+     *
+     * @param Project $project
      * @param array $payload
      */
-    protected function githubPullRequest($projectId, array $payload, b8\Http\Response\JsonResponse $response)
+    protected function githubPullRequest(Project $project, array $payload)
     {
         // We only want to know about open pull requests:
         if (!in_array($payload['action'], array('opened', 'synchronize', 'reopened'))) {
-            return $response;
+            return array('status' => 'ok');
         }
 
-        try {
-            $headers = array();
-            $token = \b8\Config::getInstance()->get('phpci.github.token');
+        $headers = array();
+        $token = \b8\Config::getInstance()->get('phpci.github.token');
 
-            if (!empty($token)) {
-                $headers[] = 'Authorization: token ' . $token;
+        if (!empty($token)) {
+            $headers[] = 'Authorization: token ' . $token;
+        }
+
+        $url    = $payload['pull_request']['commits_url'];
+        $http   = new \b8\HttpClient();
+        $http->setHeaders($headers);
+        $response = $http->get($url);
+
+        // Check we got a success response:
+        if (!$response['success']) {
+            throw new Exception('Could not get commits, failed API request.');
+        }
+
+        $results = array();
+        $status = 'failed';
+        foreach ($response['body'] as $commit) {
+            // Skip all but the current HEAD commit ID:
+            $id = $commit['sha'];
+            if ($id != $payload['pull_request']['head']['sha']) {
+                $results[$id] = array('status' => 'ignored', 'message' => 'not branch head');
+                continue;
             }
 
-            $url    = $payload['pull_request']['commits_url'];
-            $http   = new \b8\HttpClient();
-            $http->setHeaders($headers);
-            $response = $http->get($url);
-
-            // Check we got a success response:
-            if (!$response['success']) {
-                $message = 'Could not get commits, failed API request.';
-                $response->setResponseCode(500);
-                $response->setContent(array('status' => 'failed', 'error' => $message));
-                return $response;
-            }
-
-            foreach ($response['body'] as $commit) {
-                // Skip all but the current HEAD commit ID:
-                if ($commit['sha'] != $payload['pull_request']['head']['sha']) {
-                    continue;
-                }
-
+            try {
                 $branch = str_replace('refs/heads/', '', $payload['pull_request']['base']['ref']);
                 $committer = $commit['commit']['author']['email'];
                 $message = $commit['commit']['message'];
@@ -249,83 +268,96 @@ class WebhookController extends \PHPCI\Controller
                     'remote_url' => $payload['pull_request']['head']['repo']['clone_url'],
                 );
 
-                $this->createBuild($projectId, $commit['sha'], $branch, $committer, $message, $extra);
+                $results[$id] = $this->createBuild($project, $id, $branch, $committer, $message, $extra);
+                $status = 'ok';
+            } catch (Exception $ex) {
+                $results[$id] = array('status' => 'failed', 'error' => $ex->getMessage());
             }
-        } catch (\Exception $ex) {
-            $response->setResponseCode(500);
-            $response->setContent(array('status' => 'failed', 'error' => $ex->getMessage()));
         }
 
-        return $response;
+        return array('status' => $status, 'commits' => $results);
     }
 
     /**
      * Called by Gitlab Webhooks:
      */
-    public function gitlab($project)
+    public function gitlab($projectId)
     {
-        $response = new b8\Http\Response\JsonResponse();
-        $response->setContent(array('status' => 'ok'));
+        $project = $this->fetchProject($projectId, 'gitlab');
 
         $payloadString = file_get_contents("php://input");
         $payload = json_decode($payloadString, true);
 
-        try {
-            // build on merge request events
-            if (isset($payload['object_kind']) && $payload['object_kind'] == 'merge_request') {
-                $attributes = $payload['object_attributes'];
-                if ($attributes['state'] == 'opened' || $attributes['state'] == 'reopened') {
-                    $branch = $attributes['source_branch'];
-                    $commit = $attributes['last_commit'];
-                    $committer = $commit['author']['email'];
+        // build on merge request events
+        if (isset($payload['object_kind']) && $payload['object_kind'] == 'merge_request') {
+            $attributes = $payload['object_attributes'];
+            if ($attributes['state'] == 'opened' || $attributes['state'] == 'reopened') {
+                $branch = $attributes['source_branch'];
+                $commit = $attributes['last_commit'];
+                $committer = $commit['author']['email'];
 
-                    $this->createBuild($project, $commit['id'], $branch, $committer, $commit['message']);
-                }
+                return $this->createBuild($project, $commit['id'], $branch, $committer, $commit['message']);
             }
-
-            // build on push events
-            if (isset($payload['commits']) && is_array($payload['commits'])) {
-                // If we have a list of commits, then add them all as builds to be tested:
-
-                foreach ($payload['commits'] as $commit) {
-                    $branch = str_replace('refs/heads/', '', $payload['ref']);
-                    $committer = $commit['author']['email'];
-                    $this->createBuild($project, $commit['id'], $branch, $committer, $commit['message']);
-                }
-            }
-
-        } catch (\Exception $ex) {
-            $response->setResponseCode(500);
-            $response->setContent(array('status' => 'failed', 'error' => $ex->getMessage()));
         }
 
-        return $response;
+        // build on push events
+        if (isset($payload['commits']) && is_array($payload['commits'])) {
+            // If we have a list of commits, then add them all as builds to be tested:
+
+            $results = array();
+            $status = 'failed';
+            foreach ($payload['commits'] as $commit) {
+                try {
+                    $branch = str_replace('refs/heads/', '', $payload['ref']);
+                    $committer = $commit['author']['email'];
+                    $results[$commit['id']] = $this->createBuild(
+                        $project,
+                        $commit['id'],
+                        $branch,
+                        $committer,
+                        $commit['message']
+                    );
+                    $status = 'ok';
+                } catch (Exception $ex) {
+                    $results[$commit['id']] = array('status' => 'failed', 'error' => $ex->getMessage());
+                }
+            }
+            return array('status' => $status, 'commits' => $results);
+        }
+
+        return array('status' => 'ignored', 'message' => 'Unusable payload.');
     }
 
     /**
      * Wrapper for creating a new build.
-     * @param $projectId
-     * @param $commitId
-     * @param $branch
-     * @param $committer
-     * @param $commitMessage
-     * @param null $extra
-     * @return bool
-     * @throws \Exception
+     *
+     * @param Project $project
+     * @param string $commitId
+     * @param string $branch
+     * @param string $committer
+     * @param string $commitMessage
+     * @param array $extra
+     *
+     * @return array
+     *
+     * @throws Exception
      */
-    protected function createBuild($projectId, $commitId, $branch, $committer, $commitMessage, $extra = null)
-    {
+    protected function createBuild(
+        Project $project,
+        $commitId,
+        $branch,
+        $committer,
+        $commitMessage,
+        array $extra = null
+    ) {
         // Check if a build already exists for this commit ID:
-        $builds = $this->buildStore->getByProjectAndCommit($projectId, $commitId);
+        $builds = $this->buildStore->getByProjectAndCommit($project->getId(), $commitId);
 
         if ($builds['count']) {
-            return true;
-        }
-
-        $project = $this->projectStore->getById($projectId);
-
-        if (empty($project)) {
-            throw new \Exception('Project does not exist:' . $projectId);
+            return array(
+                'status' => 'ignored',
+                'message' => sprintf('Duplicate of build #%d', $builds['items'][0]->getId())
+            );
         }
 
         // If not, create a new build job for it:
@@ -335,6 +367,34 @@ class WebhookController extends \PHPCI\Controller
         // Send a status postback if the build type provides one:
         $build->sendStatusPostback();
 
-        return true;
+        return array('status' => 'ok', 'buildID' => $build->getID());
+    }
+
+    /**
+     * Fetch a project and check its type.
+     *
+     * @param int $projectId
+     * @param array|string $expectedType
+     *
+     * @return Project
+     *
+     * @throws Exception If the project does not exist or is not of the expected type.
+     */
+    protected function fetchProject($projectId, $expectedType)
+    {
+        $project = $this->projectStore->getById($projectId);
+
+        if (empty($projectId)) {
+            throw new Exception('Project does not exist: ' . $projectId);
+        }
+
+        if (is_array($expectedType)
+            ? !in_array($project->getType(), $expectedType)
+            : $project->getType() !== $expectedType
+        ) {
+            throw new Exception('Wrong project type: ' . $project->getType());
+        }
+
+        return $project;
     }
 }
diff --git a/Tests/PHPCI/Controller/WebhookControllerTest.php b/Tests/PHPCI/Controller/WebhookControllerTest.php
new file mode 100644
index 00000000..ddd13fc0
--- /dev/null
+++ b/Tests/PHPCI/Controller/WebhookControllerTest.php
@@ -0,0 +1,41 @@
+prophesize('b8\Config')->reveal(),
+            $this->prophesize('b8\Http\Request')->reveal(),
+            $this->prophesize('b8\Http\Response')->reveal()
+        );
+
+        $error = $webController->handleAction('test', []);
+
+        $this->assertInstanceOf('b8\Http\Response\JsonResponse', $error);
+
+        $responseData = $error->getData();
+        $this->assertEquals(500, $responseData['code']);
+
+        $this->assertEquals('failed', $responseData['body']['status']);
+
+        $this->assertEquals('application/json', $responseData['headers']['Content-Type']);
+
+        // @todo: we can't text the result is JSON file with
+        //   $this->assertJson((string) $error);
+        // since the flush method automatically add the header and break the
+        // testing framework.
+    }
+}

From 067a60983fce1497482adf1802901df5820ddcb6 Mon Sep 17 00:00:00 2001
From: zviryatko 
Date: Wed, 25 Feb 2015 16:16:23 +0200
Subject: [PATCH 178/329] Fix archive link.

---
 PHPCI/View/layout.phtml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/PHPCI/View/layout.phtml b/PHPCI/View/layout.phtml
index 72ef27ff..82eabfe5 100644
--- a/PHPCI/View/layout.phtml
+++ b/PHPCI/View/layout.phtml
@@ -138,7 +138,7 @@
 
             
             
      
-                
    • 
+                >
                     
                          
                     
@@ -238,8 +238,8 @@
                     
      • 
                 
 
-                
    • 
-                    
+                
    • 
+                    
                          
                     
                 
      • 

From 60131ae7b6a9cdf0c7660ce6cfc98ffd69af98ad Mon Sep 17 00:00:00 2001
From: Martin Sadovy 
Date: Thu, 26 Feb 2015 19:59:49 +0100
Subject: [PATCH 179/329] Github: Support pull private repository from pull
 request

Closes #832
---
 PHPCI/Controller/WebhookController.php | 4 +++-
 PHPCI/Model/Build/GithubBuild.php      | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/PHPCI/Controller/WebhookController.php b/PHPCI/Controller/WebhookController.php
index e05cfbda..45a775ad 100644
--- a/PHPCI/Controller/WebhookController.php
+++ b/PHPCI/Controller/WebhookController.php
@@ -260,12 +260,14 @@ class WebhookController extends \b8\Controller
                 $committer = $commit['commit']['author']['email'];
                 $message = $commit['commit']['message'];
 
+                $remoteUrlKey = $payload['pull_request']['head']['repo']['private'] ? 'ssh_url' : 'clone_url';
+
                 $extra = array(
                     'build_type' => 'pull_request',
                     'pull_request_id' => $payload['pull_request']['id'],
                     'pull_request_number' => $payload['number'],
                     'remote_branch' => $payload['pull_request']['head']['ref'],
-                    'remote_url' => $payload['pull_request']['head']['repo']['clone_url'],
+                    'remote_url' => $payload['pull_request']['head']['repo'][$remoteUrlKey],
                 );
 
                 $results[$id] = $this->createBuild($project, $id, $branch, $committer, $message, $extra);
diff --git a/PHPCI/Model/Build/GithubBuild.php b/PHPCI/Model/Build/GithubBuild.php
index 4d61b9d6..d6b2b7b9 100644
--- a/PHPCI/Model/Build/GithubBuild.php
+++ b/PHPCI/Model/Build/GithubBuild.php
@@ -125,7 +125,7 @@ class GithubBuild extends RemoteGitBuild
 
         if ($this->getExtra('build_type') == 'pull_request') {
             $matches = array();
-            preg_match('/\/([a-zA-Z0-9_\-]+\/[a-zA-Z0-9_\-]+)/', $this->getExtra('remote_url'), $matches);
+            preg_match('/[\/:]([a-zA-Z0-9_\-]+\/[a-zA-Z0-9_\-]+)/', $this->getExtra('remote_url'), $matches);
 
             $reference = $matches[1];
             $branch = $this->getExtra('remote_branch');

From 9590336c499047ff186248401331c8122c9ab9ae Mon Sep 17 00:00:00 2001
From: Adirelle 
Date: Fri, 27 Feb 2015 10:51:18 +0100
Subject: [PATCH 180/329] Added a new configuration variable,
 PHPCI_BUILD_ROOT_DI.

This variable allows to change where the build happens.
It defaults to PHPCI_DIR.'PHPCI/build/'.

Moved build path calculate and build removal into the Build class.

Also remove the build directory when deleting the build.

Close #834
---
 PHPCI/Builder.php              | 16 ++++++----------
 PHPCI/Command/RunCommand.php   | 17 +----------------
 PHPCI/Model/Build.php          | 24 ++++++++++++++++++++++++
 PHPCI/Service/BuildService.php |  1 +
 vars.php                       |  5 +++++
 5 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/PHPCI/Builder.php b/PHPCI/Builder.php
index 619c0b38..b2a135f4 100644
--- a/PHPCI/Builder.php
+++ b/PHPCI/Builder.php
@@ -215,15 +215,6 @@ class Builder implements LoggerAwareInterface
                 $this->pluginExecutor->executePlugins($this->config, 'failure');
                 $this->buildLogger->logFailure(Lang::get('build_failed'));
             }
-
-            // Clean up:
-            $this->buildLogger->log(Lang::get('removing_build'));
-
-            $cmd = 'rm -Rf "%s"';
-            if (IS_WIN) {
-                $cmd = 'rmdir /S /Q "%s"';
-            }
-            $this->executeCommand($cmd, rtrim($this->buildPath, '/'));
         } catch (\Exception $ex) {
             $this->build->setStatus(Build::STATUS_FAILED);
             $this->buildLogger->logFailure(Lang::get('exception') . $ex->getMessage());
@@ -233,6 +224,11 @@ class Builder implements LoggerAwareInterface
         // Update the build in the database, ping any external services, etc.
         $this->build->sendStatusPostback();
         $this->build->setFinished(new \DateTime());
+
+        // Clean up:
+        $this->buildLogger->log(Lang::get('removing_build'));
+        $this->build->removeBuildDirectory();
+
         $this->store->save($this->build);
     }
 
@@ -287,7 +283,7 @@ class Builder implements LoggerAwareInterface
      */
     protected function setupBuild()
     {
-        $this->buildPath = PHPCI_DIR . 'PHPCI/build/' . $this->build->getId() . '/';
+        $this->buildPath = $this->build->getBuildPath() . '/';
         $this->build->currentBuildPath = $this->buildPath;
 
         $this->interpolator->setupInterpolationVars(
diff --git a/PHPCI/Command/RunCommand.php b/PHPCI/Command/RunCommand.php
index 0cbd8e6a..c2c352e6 100644
--- a/PHPCI/Command/RunCommand.php
+++ b/PHPCI/Command/RunCommand.php
@@ -166,7 +166,7 @@ class RunCommand extends Command
                 $build->setStatus(Build::STATUS_FAILED);
                 $build->setFinished(new \DateTime());
                 $store->save($build);
-                $this->removeBuildDirectory($build);
+                $build->removeBuildDirectory();
                 continue;
             }
 
@@ -175,19 +175,4 @@ class RunCommand extends Command
 
         return $rtn;
     }
-
-    protected function removeBuildDirectory($build)
-    {
-        $buildPath = PHPCI_DIR . 'PHPCI/build/' . $build->getId() . '/';
-
-        if (is_dir($buildPath)) {
-            $cmd = 'rm -Rf "%s"';
-
-            if (IS_WIN) {
-                $cmd = 'rmdir /S /Q "%s"';
-            }
-
-            shell_exec($cmd);
-        }
-    }
 }
diff --git a/PHPCI/Model/Build.php b/PHPCI/Model/Build.php
index 3d07778a..2681498f 100644
--- a/PHPCI/Model/Build.php
+++ b/PHPCI/Model/Build.php
@@ -217,4 +217,28 @@ class Build extends BuildBase
     {
         return array($builder, $file, $line, $message);
     }
+
+    /**
+     * Return the path to run this build into.
+     *
+     * @return string
+     */
+    public function getBuildPath()
+    {
+        return PHPCI_BUILD_ROOT_DIR . $this->getId();
+    }
+
+    /**
+     * Removes the build directory.
+     */
+    public function removeBuildDirectory()
+    {
+        $buildPath = $this->getBuildPath();
+
+        if (!is_dir($buildPath)) {
+            return;
+        }
+
+        exec(sprintf(IS_WIN ? 'rmdir /S /Q "%s"' : 'rm -Rf "%s"', $buildPath));
+    }
 }
diff --git a/PHPCI/Service/BuildService.php b/PHPCI/Service/BuildService.php
index ca2336c8..a95ac44f 100644
--- a/PHPCI/Service/BuildService.php
+++ b/PHPCI/Service/BuildService.php
@@ -112,6 +112,7 @@ class BuildService
      */
     public function deleteBuild(Build $build)
     {
+        $build->removeBuildDirectory();
         return $this->buildStore->delete($build);
     }
 }
diff --git a/vars.php b/vars.php
index b622ab31..98c07377 100644
--- a/vars.php
+++ b/vars.php
@@ -16,6 +16,11 @@ if (!defined('PHPCI_BIN_DIR')) {
     define('PHPCI_BIN_DIR', PHPCI_DIR . 'vendor/bin/');
 }
 
+// Define PHPCI_BUILD_ROOT_DIR
+if (!defined('PHPCI_BUILD_ROOT_DIR')) {
+    define('PHPCI_BUILD_ROOT_DIR', PHPCI_DIR . 'PHPCI/build/');
+}
+
 // Should PHPCI run the Shell plugin?
 if (!defined('ENABLE_SHELL_PLUGIN')) {
     define('ENABLE_SHELL_PLUGIN', false);

From 452a5ba97c7846b95f7933177d3d41db90f0cb9b Mon Sep 17 00:00:00 2001
From: Adirelle 
Date: Tue, 3 Mar 2015 17:18:17 +0100
Subject: [PATCH 181/329] Enforce "en" lang in tests.

Some tests compare the result to english strings.

Do not test UnixCommandExecutor on Windows.

PharTest: explain why PHAR writing test are skipped.

InstallCommandTest: mock checkRequirements to allow the tests to run.

Run php_parallel_lint before all other tests.

Close #846
---
 PHPCI/Helper/Lang.php                         |   2 +-
 PHPCI/Plugin/Util/Factory.php                 |   2 +-
 .../PHPCI/Command/CreateAdminCommandTest.php  |  17 +--
 Tests/PHPCI/Command/InstallCommandTest.php    |  29 +++--
 .../Controller/WebhookControllerTest.php      |  10 +-
 Tests/PHPCI/Helper/AnsiConverterTest.php      |  17 ++-
 Tests/PHPCI/Helper/BuildInterpolatorTest.php  |  15 ++-
 Tests/PHPCI/Helper/CommandExecutorTest.php    |  19 ++-
 Tests/PHPCI/Helper/LangTest.php               |  13 +-
 Tests/PHPCI/Helper/MailerFactoryTest.php      |   7 +-
 Tests/PHPCI/Logging/BuildLoggerTest.php       |  15 ++-
 Tests/PHPCI/Logging/LoggerConfigTest.php      |  12 +-
 Tests/PHPCI/Model/BuildTest.php               |   8 +-
 Tests/PHPCI/Model/ProjectTest.php             |   8 +-
 Tests/PHPCI/Plugin/EmailTest.php              |  32 +++--
 Tests/PHPCI/Plugin/PharTest.php               |  14 +-
 .../Util/ComposerPluginInformationTest.php    |  12 +-
 .../PHPCI/Plugin/Util/ExamplePluginConfig.php |  11 +-
 Tests/PHPCI/Plugin/Util/ExamplePlugins.php    |  78 -----------
 Tests/PHPCI/Plugin/Util/ExecutorTest.php      |  28 ++--
 Tests/PHPCI/Plugin/Util/FactoryTest.php       |  78 +++++------
 .../Plugin/Util/Fake/ExamplePluginFull.php    |  36 ++++++
 .../ExamplePluginWithNoConstructorArgs.php    |  20 +++
 .../ExamplePluginWithSingleOptionalArg.php    |  26 ++++
 .../ExamplePluginWithSingleRequiredArg.php    |  29 +++++
 ...xamplePluginWithSingleTypedRequiredArg.php |  29 +++++
 .../Util/FilesPluginInformationTest.php       |  12 +-
 Tests/PHPCI/Plugin/Util/TapParserTest.php     |  11 +-
 Tests/PHPCI/Service/BuildServiceTest.php      |   7 +-
 Tests/PHPCI/Service/ProjectServiceTest.php    |   8 +-
 Tests/PHPCI/Service/UserServiceTest.php       |   7 +-
 Tests/bootstrap.php                           |   1 +
 composer.json                                 |  10 +-
 composer.lock                                 | 121 +++++++++---------
 loggerconfig.php.example                      |   8 ++
 phinx.php                                     |   8 ++
 phpci.yml                                     |   4 +
 37 files changed, 492 insertions(+), 272 deletions(-)
 delete mode 100644 Tests/PHPCI/Plugin/Util/ExamplePlugins.php
 create mode 100644 Tests/PHPCI/Plugin/Util/Fake/ExamplePluginFull.php
 create mode 100644 Tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithNoConstructorArgs.php
 create mode 100644 Tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleOptionalArg.php
 create mode 100644 Tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleRequiredArg.php
 create mode 100644 Tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleTypedRequiredArg.php

diff --git a/PHPCI/Helper/Lang.php b/PHPCI/Helper/Lang.php
index c86de1aa..42027cee 100644
--- a/PHPCI/Helper/Lang.php
+++ b/PHPCI/Helper/Lang.php
@@ -156,7 +156,7 @@ class Lang
             return null;
         }
 
-        require_once($langFile);
+        require($langFile);
 
         if (is_null($strings) || !is_array($strings) || !count($strings)) {
             return null;
diff --git a/PHPCI/Plugin/Util/Factory.php b/PHPCI/Plugin/Util/Factory.php
index 8127bcd2..76de2b7d 100644
--- a/PHPCI/Plugin/Util/Factory.php
+++ b/PHPCI/Plugin/Util/Factory.php
@@ -185,7 +185,7 @@ class Factory
             return $class->getName();
         } elseif ($param->isArray()) {
             return self::TYPE_ARRAY;
-        } elseif ($param->isCallable()) {
+        } elseif (is_callable($param)) {
             return self::TYPE_CALLABLE;
         } else {
             return null;
diff --git a/Tests/PHPCI/Command/CreateAdminCommandTest.php b/Tests/PHPCI/Command/CreateAdminCommandTest.php
index 738d8f8a..10b7b7f3 100644
--- a/Tests/PHPCI/Command/CreateAdminCommandTest.php
+++ b/Tests/PHPCI/Command/CreateAdminCommandTest.php
@@ -1,13 +1,14 @@
 command = $this->getMockBuilder('PHPCI\\Command\\CreateAdminCommand')
-            ->setConstructorArgs([$this->getMock('PHPCI\\Store\\UserStore')])
-            ->setMethods(['reloadConfig'])
+            ->setConstructorArgs(array($this->getMock('PHPCI\\Store\\UserStore')))
+            ->setMethods(array('reloadConfig'))
             ->getMock()
         ;
 
         $this->dialog = $this->getMockBuilder('Symfony\\Component\\Console\\Helper\\DialogHelper')
-            ->setMethods([
+            ->setMethods(array(
                 'ask',
                 'askAndValidate',
                 'askHiddenResponse',
-            ])
+            ))
             ->getMock()
         ;
 
@@ -71,7 +72,7 @@ class CreateAdminCommandTest extends \PHPUnit_Framework_TestCase
         $this->dialog->expects($this->at(2))->method('askHiddenResponse')->will($this->returnValue('foobar123'));
 
         $commandTester = $this->getCommandTester();
-        $commandTester->execute([]);
+        $commandTester->execute(array());
 
         $this->assertEquals('User account created!' . PHP_EOL, $commandTester->getDisplay());
     }
diff --git a/Tests/PHPCI/Command/InstallCommandTest.php b/Tests/PHPCI/Command/InstallCommandTest.php
index 4dd0f133..73b83462 100644
--- a/Tests/PHPCI/Command/InstallCommandTest.php
+++ b/Tests/PHPCI/Command/InstallCommandTest.php
@@ -1,16 +1,23 @@
 getMock();
 
+        $self = $this;
+
         $command->expects($this->once())->method('verifyNotInstalled')->willReturn(true);
         $command->expects($this->once())->method('verifyDatabaseDetails')->willReturn(true);
         $command->expects($this->once())->method('setupDatabase')->willReturn(true);
         $command->expects($this->once())->method('createAdminUser')->will(
-            $this->returnCallback(function ($adm) {// use (&$admin) {
-                $this->admin = $adm;
+            $this->returnCallback(function ($adm) use ($self) {
+                $self->admin = $adm;
             })
         );
         $command->expects($this->once())->method('writeConfigFile')->will(
-            $this->returnCallback(function ($cfg) { //use (&$config) {
-                $this->config = $cfg;
+            $this->returnCallback(function ($cfg) use ($self) {
+                $self->config = $cfg;
             })
         );
+        $command->expects($this->once())->method('checkRequirements');
 
         return $command;
     }
diff --git a/Tests/PHPCI/Controller/WebhookControllerTest.php b/Tests/PHPCI/Controller/WebhookControllerTest.php
index ddd13fc0..b3b31e42 100644
--- a/Tests/PHPCI/Controller/WebhookControllerTest.php
+++ b/Tests/PHPCI/Controller/WebhookControllerTest.php
@@ -1,18 +1,18 @@
 markTestSkipped('External library do not support PHP 5.3');
+        }
+    }
+
     public function testConvert_convertToHtml()
     {
         $input = "\e[31mThis is red !\e[0m";
diff --git a/Tests/PHPCI/Helper/BuildInterpolatorTest.php b/Tests/PHPCI/Helper/BuildInterpolatorTest.php
index c45e1b8c..8961b2d8 100644
--- a/Tests/PHPCI/Helper/BuildInterpolatorTest.php
+++ b/Tests/PHPCI/Helper/BuildInterpolatorTest.php
@@ -1,11 +1,18 @@
 assertEquals($expectedOutput, $actualOutput);
     }
 }
- 
\ No newline at end of file
+
diff --git a/Tests/PHPCI/Helper/CommandExecutorTest.php b/Tests/PHPCI/Helper/CommandExecutorTest.php
index 8ae045dc..4cf14887 100644
--- a/Tests/PHPCI/Helper/CommandExecutorTest.php
+++ b/Tests/PHPCI/Helper/CommandExecutorTest.php
@@ -1,11 +1,18 @@
 markTestSkipped("Cannot test UnixCommandExecutor on ".PHP_OS);
+            return;
+        }
         parent::setUp();
         $mockBuildLogger = $this->prophesize('PHPCI\Logging\BuildLogger');
         $this->testedExecutor = new UnixCommandExecutor($mockBuildLogger->reveal(), __DIR__ . "/");
@@ -52,4 +63,4 @@ class CommandExecutorTest extends ProphecyTestCase
         $returnValue = $this->testedExecutor->findBinary($thisFileName);
         $this->assertEquals(__DIR__ . "/" . $thisFileName, $returnValue);
     }
-}
\ No newline at end of file
+}
diff --git a/Tests/PHPCI/Helper/LangTest.php b/Tests/PHPCI/Helper/LangTest.php
index 492cca52..b71ee41d 100644
--- a/Tests/PHPCI/Helper/LangTest.php
+++ b/Tests/PHPCI/Helper/LangTest.php
@@ -1,12 +1,19 @@
 testedBuildLogger->logFailure($message, $exception);
     }
 }
- 
\ No newline at end of file
+
diff --git a/Tests/PHPCI/Logging/LoggerConfigTest.php b/Tests/PHPCI/Logging/LoggerConfigTest.php
index f1e78245..3baf10c1 100644
--- a/Tests/PHPCI/Logging/LoggerConfigTest.php
+++ b/Tests/PHPCI/Logging/LoggerConfigTest.php
@@ -1,6 +1,14 @@
 assertNotSame($alternativeHandler, $actualHandler);
     }
 }
- 
\ No newline at end of file
+
diff --git a/Tests/PHPCI/Model/BuildTest.php b/Tests/PHPCI/Model/BuildTest.php
index b8ee3432..24508fe7 100644
--- a/Tests/PHPCI/Model/BuildTest.php
+++ b/Tests/PHPCI/Model/BuildTest.php
@@ -1,13 +1,15 @@
 message = array();
         $this->mailDelivered = true;
+        $self = $this;
 
         $this->mockProject = $this->getMock(
             '\PHPCI\Model\Project',
@@ -85,8 +87,8 @@ class EmailTest extends \PHPUnit_Framework_TestCase
 
         $this->mockBuild->expects($this->any())
             ->method('getStatus')
-            ->will($this->returnCallback(function () {
-                return $this->buildStatus;
+            ->will($this->returnCallback(function () use ($self) {
+                return $self->buildStatus;
             }));
 
         $this->mockBuild->expects($this->any())
@@ -138,6 +140,8 @@ class EmailTest extends \PHPUnit_Framework_TestCase
         // Reset current message.
         $this->message = array();
 
+        $self = $this;
+
         $this->testedEmailPlugin = $this->getMock(
             '\PHPCI\Plugin\Email',
             array('sendEmail'),
@@ -150,13 +154,13 @@ class EmailTest extends \PHPUnit_Framework_TestCase
 
         $this->testedEmailPlugin->expects($this->any())
             ->method('sendEmail')
-            ->will($this->returnCallback(function ($to, $cc, $subject, $body) {
-                $this->message['to'][] = $to;
-                $this->message['cc'] = $cc;
-                $this->message['subject'] = $subject;
-                $this->message['body'] = $body;
+            ->will($this->returnCallback(function ($to, $cc, $subject, $body) use ($self) {
+                $self->message['to'][] = $to;
+                $self->message['cc'] = $cc;
+                $self->message['subject'] = $subject;
+                $self->message['body'] = $body;
 
-                return $this->mailDelivered;
+                return $self->mailDelivered;
             }));
     }
 
diff --git a/Tests/PHPCI/Plugin/PharTest.php b/Tests/PHPCI/Plugin/PharTest.php
index 69f63a6a..edb17d69 100644
--- a/Tests/PHPCI/Plugin/PharTest.php
+++ b/Tests/PHPCI/Plugin/PharTest.php
@@ -1,5 +1,14 @@
 markTestSkipped();
-            throw new RuntimeException('Readonly Phar');
+            $this->markTestSkipped('phar writing disabled in php.ini.');
         }
     }
 
diff --git a/Tests/PHPCI/Plugin/Util/ComposerPluginInformationTest.php b/Tests/PHPCI/Plugin/Util/ComposerPluginInformationTest.php
index 113c1087..1174d44f 100644
--- a/Tests/PHPCI/Plugin/Util/ComposerPluginInformationTest.php
+++ b/Tests/PHPCI/Plugin/Util/ComposerPluginInformationTest.php
@@ -1,6 +1,14 @@
 assertContainsOnly("string", $classes);
     }
 }
- 
\ No newline at end of file
+
diff --git a/Tests/PHPCI/Plugin/Util/ExamplePluginConfig.php b/Tests/PHPCI/Plugin/Util/ExamplePluginConfig.php
index 0b883071..5b0819c4 100644
--- a/Tests/PHPCI/Plugin/Util/ExamplePluginConfig.php
+++ b/Tests/PHPCI/Plugin/Util/ExamplePluginConfig.php
@@ -1,4 +1,13 @@
 registerResource(
         // This function will be called when the resource is needed.
@@ -10,4 +19,4 @@ return function (PHPCI\Plugin\Util\Factory $factory) {
         "requiredArgument",
         null
     );
-};
\ No newline at end of file
+};
diff --git a/Tests/PHPCI/Plugin/Util/ExamplePlugins.php b/Tests/PHPCI/Plugin/Util/ExamplePlugins.php
deleted file mode 100644
index bc67bd3f..00000000
--- a/Tests/PHPCI/Plugin/Util/ExamplePlugins.php
+++ /dev/null
@@ -1,78 +0,0 @@
-RequiredArgument = $requiredArgument;
-    }
-
-    public function execute()
-    {
-
-    }
-}
-
-class ExamplePluginWithSingleTypedRequiredArg implements Plugin
-{
-
-    public $RequiredArgument;
-
-    function __construct(\stdClass $requiredArgument)
-    {
-        $this->RequiredArgument = $requiredArgument;
-    }
-
-    public function execute()
-    {
-
-    }
-}
-
-class ExamplePluginFull implements Plugin {
-
-    public $Options;
-
-    public function __construct(
-        Builder $phpci,
-        Build $build,
-        array $options = array()
-    )
-    {
-        $this->Options = $options;
-    }
-
-    public function execute()
-    {
-
-    }
-
-}
\ No newline at end of file
diff --git a/Tests/PHPCI/Plugin/Util/ExecutorTest.php b/Tests/PHPCI/Plugin/Util/ExecutorTest.php
index 2bcc7780..8501f209 100644
--- a/Tests/PHPCI/Plugin/Util/ExecutorTest.php
+++ b/Tests/PHPCI/Plugin/Util/ExecutorTest.php
@@ -1,14 +1,19 @@
 getFakePluginClassName('ExamplePluginFull');
 
-        $this->mockFactory->buildPlugin($pluginNamespace . $pluginName, $options)
+        $this->mockFactory->buildPlugin($pluginClass, $options)
           ->shouldBeCalledTimes(1)
           ->willReturn($this->prophesize('PHPCI\Plugin')->reveal());
 
-        $this->testedExecutor->executePlugin($pluginNamespace . $pluginName, $options);
+        $this->testedExecutor->executePlugin($pluginClass, $options);
     }
 
     public function testExecutePlugin_CallsExecuteOnFactoryBuildPlugin()
@@ -142,5 +146,11 @@ class ExecutorTest extends ProphecyTestCase
         $this->testedExecutor->executePlugins($config, 'stageOne');
     }
 
+    protected function getFakePluginClassName($pluginName)
+    {
+        $pluginNamespace = '\\Tests\\PHPCI\\Plugin\\Util\\Fake\\';
+
+        return $pluginNamespace . $pluginName;
+    }
 }
- 
\ No newline at end of file
+
diff --git a/Tests/PHPCI/Plugin/Util/FactoryTest.php b/Tests/PHPCI/Plugin/Util/FactoryTest.php
index 72ed714b..e609011a 100644
--- a/Tests/PHPCI/Plugin/Util/FactoryTest.php
+++ b/Tests/PHPCI/Plugin/Util/FactoryTest.php
@@ -1,8 +1,14 @@
 testedFactory->buildPlugin($expectedPluginClass);
-        $this->assertInstanceOf($expectedPluginClass, $plugin);
+        $pluginClass = $this->getFakePluginClassName('ExamplePluginWithNoConstructorArgs');
+        $plugin = $this->testedFactory->buildPlugin($pluginClass);
+        $this->assertInstanceOf($pluginClass, $plugin);
     }
 
     public function testBuildPluginFailsForNonPluginClasses()
@@ -63,10 +68,9 @@ class FactoryTest extends \PHPUnit_Framework_TestCase {
 
     public function testBuildPluginWorksWithSingleOptionalArgConstructor()
     {
-        $namespace = '\\PHPCI\\Plugin\\Tests\\Util\\';
-        $expectedPluginClass = $namespace  . 'ExamplePluginWithSingleOptionalArg';
-        $plugin = $this->testedFactory->buildPlugin($expectedPluginClass);
-        $this->assertInstanceOf($expectedPluginClass, $plugin);
+        $pluginClass = $this->getFakePluginClassName('ExamplePluginWithSingleOptionalArg');
+        $plugin = $this->testedFactory->buildPlugin($pluginClass);
+        $this->assertInstanceOf($pluginClass, $plugin);
     }
 
     public function testBuildPluginThrowsExceptionIfMissingResourcesForRequiredArg()
@@ -76,15 +80,13 @@ class FactoryTest extends \PHPUnit_Framework_TestCase {
             'Unsatisfied dependency: requiredArgument'
         );
 
-        $namespace = '\\PHPCI\\Plugin\\Tests\\Util\\';
-        $expectedPluginClass = $namespace  . 'ExamplePluginWithSingleRequiredArg';
-        $plugin = $this->testedFactory->buildPlugin($expectedPluginClass);
+        $pluginClass = $this->getFakePluginClassName('ExamplePluginWithSingleRequiredArg');
+        $plugin = $this->testedFactory->buildPlugin($pluginClass);
     }
 
     public function testBuildPluginLoadsArgumentsBasedOnName()
     {
-        $namespace = '\\PHPCI\\Plugin\\Tests\\Util\\';
-        $expectedPluginClass = $namespace  . 'ExamplePluginWithSingleRequiredArg';
+        $pluginClass = $this->getFakePluginClassName('ExamplePluginWithSingleRequiredArg');
 
         $this->testedFactory->registerResource(
             $this->resourceLoader,
@@ -92,15 +94,14 @@ class FactoryTest extends \PHPUnit_Framework_TestCase {
         );
 
         /** @var ExamplePluginWithSingleRequiredArg $plugin */
-        $plugin = $this->testedFactory->buildPlugin($expectedPluginClass);
+        $plugin = $this->testedFactory->buildPlugin($pluginClass);
 
         $this->assertEquals($this->expectedResource, $plugin->RequiredArgument);
     }
 
     public function testBuildPluginLoadsArgumentsBasedOnType()
     {
-        $namespace = '\\PHPCI\\Plugin\\Tests\\Util\\';
-        $expectedPluginClass = $namespace  . 'ExamplePluginWithSingleTypedRequiredArg';
+        $pluginClass = $this->getFakePluginClassName('ExamplePluginWithSingleTypedRequiredArg');
 
         $this->testedFactory->registerResource(
             $this->resourceLoader,
@@ -109,28 +110,26 @@ class FactoryTest extends \PHPUnit_Framework_TestCase {
         );
 
         /** @var ExamplePluginWithSingleTypedRequiredArg $plugin */
-        $plugin = $this->testedFactory->buildPlugin($expectedPluginClass);
+        $plugin = $this->testedFactory->buildPlugin($pluginClass);
 
         $this->assertEquals($this->expectedResource, $plugin->RequiredArgument);
     }
 
     public function testBuildPluginLoadsFullExample()
     {
-        $namespace = '\\PHPCI\\Plugin\\Tests\\Util\\';
-        $expectedPluginClass = $namespace  . 'ExamplePluginFull';
+        $pluginClass = $this->getFakePluginClassName('ExamplePluginFull');
 
         $this->registerBuildAndBuilder();
 
         /** @var ExamplePluginFull $plugin */
-        $plugin = $this->testedFactory->buildPlugin($expectedPluginClass);
+        $plugin = $this->testedFactory->buildPlugin($pluginClass);
 
-        $this->assertInstanceOf($expectedPluginClass, $plugin);
+        $this->assertInstanceOf($pluginClass, $plugin);
     }
 
     public function testBuildPluginLoadsFullExampleWithOptions()
     {
-        $namespace = '\\PHPCI\\Plugin\\Tests\\Util\\';
-        $expectedPluginClass = $namespace  . 'ExamplePluginFull';
+        $pluginClass = $this->getFakePluginClassName('ExamplePluginFull');
 
         $expectedArgs = array(
             'thing' => "stuff"
@@ -140,7 +139,7 @@ class FactoryTest extends \PHPUnit_Framework_TestCase {
 
         /** @var ExamplePluginFull $plugin */
         $plugin = $this->testedFactory->buildPlugin(
-            $expectedPluginClass,
+            $pluginClass,
             $expectedArgs
         );
 
@@ -163,10 +162,8 @@ class FactoryTest extends \PHPUnit_Framework_TestCase {
             realpath(__DIR__ . "/ExamplePluginConfig.php")
         );
 
-        $namespace = '\\PHPCI\\Plugin\\Tests\\Util\\';
-        $pluginName = $namespace  . 'ExamplePluginWithSingleRequiredArg';
-
-        $plugin = $this->testedFactory->buildPlugin($pluginName);
+        $pluginClass = $this->getFakePluginClassName('ExamplePluginWithSingleRequiredArg');
+        $plugin = $this->testedFactory->buildPlugin($pluginClass);
 
         // The Example config file defines an array as the resource.
         $this->assertEquals(
@@ -181,9 +178,11 @@ class FactoryTest extends \PHPUnit_Framework_TestCase {
      */
     private function registerBuildAndBuilder()
     {
+        $self = $this;
+
         $this->testedFactory->registerResource(
-            function () {
-                return $this->getMock(
+            function () use ($self) {
+                return $self->getMock(
                     'PHPCI\Builder',
                     array(),
                     array(),
@@ -196,8 +195,8 @@ class FactoryTest extends \PHPUnit_Framework_TestCase {
         );
 
         $this->testedFactory->registerResource(
-            function () {
-                return $this->getMock(
+            function () use ($self) {
+                return $self->getMock(
                     'PHPCI\Model\Build',
                     array(),
                     array(),
@@ -206,8 +205,15 @@ class FactoryTest extends \PHPUnit_Framework_TestCase {
                 );
             },
             null,
-            'PHPCI\\Model\Build'
+            'PHPCI\\Model\\Build'
         );
     }
+
+    protected function getFakePluginClassName($pluginName)
+    {
+        $pluginNamespace = '\\Tests\\PHPCI\\Plugin\\Util\\Fake\\';
+
+        return $pluginNamespace . $pluginName;
+    }
 }
- 
\ No newline at end of file
+
diff --git a/Tests/PHPCI/Plugin/Util/Fake/ExamplePluginFull.php b/Tests/PHPCI/Plugin/Util/Fake/ExamplePluginFull.php
new file mode 100644
index 00000000..fa81a352
--- /dev/null
+++ b/Tests/PHPCI/Plugin/Util/Fake/ExamplePluginFull.php
@@ -0,0 +1,36 @@
+Options = $options;
+    }
+
+    public function execute()
+    {
+
+    }
+}
diff --git a/Tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithNoConstructorArgs.php b/Tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithNoConstructorArgs.php
new file mode 100644
index 00000000..544ec4e3
--- /dev/null
+++ b/Tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithNoConstructorArgs.php
@@ -0,0 +1,20 @@
+RequiredArgument = $requiredArgument;
+    }
+
+    public function execute()
+    {
+
+    }
+}
diff --git a/Tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleTypedRequiredArg.php b/Tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleTypedRequiredArg.php
new file mode 100644
index 00000000..b256c58c
--- /dev/null
+++ b/Tests/PHPCI/Plugin/Util/Fake/ExamplePluginWithSingleTypedRequiredArg.php
@@ -0,0 +1,29 @@
+RequiredArgument = $requiredArgument;
+    }
+
+    public function execute()
+    {
+
+    }
+}
diff --git a/Tests/PHPCI/Plugin/Util/FilesPluginInformationTest.php b/Tests/PHPCI/Plugin/Util/FilesPluginInformationTest.php
index 6e1605ab..1b674e9c 100644
--- a/Tests/PHPCI/Plugin/Util/FilesPluginInformationTest.php
+++ b/Tests/PHPCI/Plugin/Util/FilesPluginInformationTest.php
@@ -1,6 +1,14 @@
 assertContainsOnly('string', $pluginInfos);
     }
 }
- 
\ No newline at end of file
+
diff --git a/Tests/PHPCI/Plugin/Util/TapParserTest.php b/Tests/PHPCI/Plugin/Util/TapParserTest.php
index 75c04bfa..732a44a6 100644
--- a/Tests/PHPCI/Plugin/Util/TapParserTest.php
+++ b/Tests/PHPCI/Plugin/Util/TapParserTest.php
@@ -1,5 +1,14 @@
 =5.3.3"
+            },
+            "require-dev": {
+                "jakub-onderka/php-console-highlighter": "~0.3",
+                "nette/tester": "~1.3"
+            },
+            "suggest": {
+                "jakub-onderka/php-console-highlighter": "Highlight syntax in code snippet"
+            },
+            "bin": [
+                "parallel-lint"
+            ],
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "./"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD"
+            ],
+            "authors": [
+                {
+                    "name": "Jakub Onderka",
+                    "email": "jakub.onderka@gmail.com"
+                }
+            ],
+            "description": "This tool check syntax of PHP files about 20x faster than serial check.",
+            "homepage": "https://github.com/JakubOnderka/PHP-Parallel-Lint",
+            "time": "2014-10-05 10:19:39"
+        },
         {
             "name": "monolog/monolog",
             "version": "1.12.0",
@@ -172,12 +219,12 @@
             "version": "v1.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/fabpot/Pimple.git",
+                "url": "https://github.com/silexphp/Pimple.git",
                 "reference": "2019c145fe393923f3441b23f29bbdfaa5c58c4d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fabpot/Pimple/zipball/2019c145fe393923f3441b23f29bbdfaa5c58c4d",
+                "url": "https://api.github.com/repos/silexphp/Pimple/zipball/2019c145fe393923f3441b23f29bbdfaa5c58c4d",
                 "reference": "2019c145fe393923f3441b23f29bbdfaa5c58c4d",
                 "shasum": ""
             },
@@ -202,9 +249,7 @@
             "authors": [
                 {
                     "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
+                    "email": "fabien@symfony.com"
                 }
             ],
             "description": "Pimple is a simple Dependency Injection Container for PHP 5.3",
@@ -977,56 +1022,6 @@
             ],
             "time": "2014-11-17 16:23:49"
         },
-        {
-            "name": "phpspec/prophecy-phpunit",
-            "version": "v1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/prophecy-phpunit.git",
-                "reference": "0d06c84b9f26aab2b9940354f0fe6037dd9799c3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy-phpunit/zipball/0d06c84b9f26aab2b9940354f0fe6037dd9799c3",
-                "reference": "0d06c84b9f26aab2b9940354f0fe6037dd9799c3",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "phpspec/prophecy": "~1.3"
-            },
-            "suggest": {
-                "phpunit/phpunit": "if it is not installed globally"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Prophecy\\PhpUnit\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Christophe Coevoet",
-                    "email": "stof@notk.org"
-                }
-            ],
-            "description": "PhpUnit test case integrating the Prophecy mocking library",
-            "homepage": "http://phpspec.net",
-            "keywords": [
-                "phpunit",
-                "prophecy"
-            ],
-            "time": "2015-02-09 11:20:26"
-        },
         {
             "name": "phpunit/php-code-coverage",
             "version": "2.0.15",
@@ -1273,16 +1268,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "4.5.0",
+            "version": "4.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "5b578d3865a9128b9c209b011fda6539ec06e7a5"
+                "reference": "d6429b0995b24a2d9dfe5587ee3a7071c1161af4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/5b578d3865a9128b9c209b011fda6539ec06e7a5",
-                "reference": "5b578d3865a9128b9c209b011fda6539ec06e7a5",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d6429b0995b24a2d9dfe5587ee3a7071c1161af4",
+                "reference": "d6429b0995b24a2d9dfe5587ee3a7071c1161af4",
                 "shasum": ""
             },
             "require": {
@@ -1292,8 +1287,8 @@
                 "ext-reflection": "*",
                 "ext-spl": "*",
                 "php": ">=5.3.3",
-                "phpspec/prophecy": "~1.3.1",
-                "phpunit/php-code-coverage": "~2.0",
+                "phpspec/prophecy": "~1.3,>=1.3.1",
+                "phpunit/php-code-coverage": "~2.0,>=2.0.11",
                 "phpunit/php-file-iterator": "~1.3.2",
                 "phpunit/php-text-template": "~1.2",
                 "phpunit/php-timer": "~1.0.2",
@@ -1341,7 +1336,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2015-02-05 15:51:19"
+            "time": "2015-03-29 09:24:05"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
diff --git a/loggerconfig.php.example b/loggerconfig.php.example
index d5abc96e..ffa22204 100644
--- a/loggerconfig.php.example
+++ b/loggerconfig.php.example
@@ -1,5 +1,13 @@
  function() {
diff --git a/phinx.php b/phinx.php
index 3c407b1e..d64749dd 100644
--- a/phinx.php
+++ b/phinx.php
@@ -1,5 +1,13 @@
 get('b8.database.servers.write');
diff --git a/phpci.yml b/phpci.yml
index 43931360..8f51c88f 100644
--- a/phpci.yml
+++ b/phpci.yml
@@ -15,6 +15,10 @@ setup:
     prefer_dist: false
 
 test:
+  php_parallel_lint:
+      ignore:
+        # Only ignore vendor
+        - vendor/
   php_mess_detector:
     allowed_warnings: 0
   php_code_sniffer:

From 77ba61c8bc5109790faf72f1a0ff02e9b9b9db3b Mon Sep 17 00:00:00 2001
From: Angel Koilov 
Date: Fri, 27 Mar 2015 12:17:22 +0200
Subject: [PATCH 182/329] add pingback for IRC plugin

Close #886
---
 PHPCI/Plugin/Irc.php | 55 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 46 insertions(+), 9 deletions(-)

diff --git a/PHPCI/Plugin/Irc.php b/PHPCI/Plugin/Irc.php
index 7fe06753..a7610a8c 100644
--- a/PHPCI/Plugin/Irc.php
+++ b/PHPCI/Plugin/Irc.php
@@ -77,19 +77,56 @@ class Irc implements \PHPCI\Plugin
         }
 
         $sock = fsockopen($this->server, $this->port);
-        fputs($sock, 'USER ' . $this->nick . ' phptesting.org ' . $this->nick . ' :' . $this->nick . "\r\n");
-        fputs($sock, 'NICK ' . $this->nick . "\r\n");
-        fputs($sock, 'JOIN ' . $this->room . "\r\n");
-        fputs($sock, 'PRIVMSG ' . $this->room . ' :' . $msg . "\r\n");
+        stream_set_timeout($sock, 1);
 
-        while (fgets($sock)) {
-            // We don't need to do anything,
-            // but the IRC server doesn't appear to post the message
-            // unless we wait for responses.
-        }
+        $connectCommands = array(
+            'USER ' . $this->nick . ' 0 * :' . $this->nick,
+            'NICK ' . $this->nick,
+        );
+        $this->executeIrcCommands($sock, $connectCommands);
+        $this->executeIrcCommand($sock, 'JOIN ' . $this->room);
+        $this->executeIrcCommand($sock, 'PRIVMSG ' . $this->room . ' :' . $msg);
 
         fclose($sock);
 
         return true;
     }
+
+    /**
+     * @param resource $socket
+     * @param array $commands
+     * @return bool
+     */
+    private function executeIrcCommands($socket, array $commands)
+    {
+        foreach ($commands as $command) {
+            fputs($socket, $command . "\n");
+        }
+
+        $pingBack = false;
+
+        // almost all servers expect pingback!
+        while ($response = fgets($socket)) {
+            $matches = array();
+            if (preg_match('/^PING \\:([A-Z0-9]+)/', $response, $matches)) {
+                $pingBack = $matches[1];
+            }
+        }
+
+        if ($pingBack) {
+            $command = 'PONG :' . $pingBack . "\n";
+            fputs($socket, $command);
+        }
+    }
+
+    /**
+     *
+     * @param resource $socket
+     * @param string $command
+     * @return bool
+     */
+    private function executeIrcCommand($socket, $command)
+    {
+        return $this->executeIrcCommands($socket, array($command));
+    }
 }

From 9261f24d257c2314a83caa010f8dc2820d43a452 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20DECOOL?= 
Date: Sat, 28 Mar 2015 13:04:28 +0100
Subject: [PATCH 183/329] Command to create a new build

Close #889
---
 PHPCI/Command/CreateBuildCommand.php          | 85 ++++++++++++++++++
 PHPCI/Languages/lang.da.php                   |  6 ++
 PHPCI/Languages/lang.de.php                   |  6 ++
 PHPCI/Languages/lang.el.php                   |  6 ++
 PHPCI/Languages/lang.en.php                   |  6 ++
 PHPCI/Languages/lang.fr.php                   |  6 ++
 PHPCI/Languages/lang.it.php                   |  6 ++
 PHPCI/Languages/lang.nl.php                   |  6 ++
 PHPCI/Languages/lang.pl.php                   |  6 ++
 PHPCI/Languages/lang.ru.php                   |  6 ++
 PHPCI/Languages/lang.uk.php                   |  6 ++
 .../PHPCI/Command/CreateBuildCommandTest.php  | 86 +++++++++++++++++++
 console                                       |  3 +
 13 files changed, 234 insertions(+)
 create mode 100644 PHPCI/Command/CreateBuildCommand.php
 create mode 100644 Tests/PHPCI/Command/CreateBuildCommandTest.php

diff --git a/PHPCI/Command/CreateBuildCommand.php b/PHPCI/Command/CreateBuildCommand.php
new file mode 100644
index 00000000..01260080
--- /dev/null
+++ b/PHPCI/Command/CreateBuildCommand.php
@@ -0,0 +1,85 @@
+projectStore = $projectStore;
+        $this->buildService = $buildService;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function configure()
+    {
+        $this
+            ->setName('phpci:create-build')
+            ->setDescription(Lang::get('create_build_project'))
+            ->addArgument('projectId', InputArgument::REQUIRED, Lang::get('project_id_argument'))
+            ->addOption('commit', null, InputOption::VALUE_OPTIONAL, Lang::get('commit_id_option'))
+            ->addOption('branch', null, InputOption::VALUE_OPTIONAL, Lang::get('branch_name_option'));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function execute(InputInterface $input, OutputInterface $output)
+    {
+        $projectId = $input->getArgument('projectId');
+        $commitId = $input->getOption('commit');
+        $branch = $input->getOption('branch');
+
+        $project = $this->projectStore->getById($projectId);
+        if (empty($project)) {
+            throw new \InvalidArgumentException('Project does not exist: ' . $projectId);
+        }
+
+        try {
+            $this->buildService->createBuild($project, $commitId, $branch);
+            $output->writeln(Lang::get('build_created'));
+        } catch (\Exception $e) {
+            $output->writeln(sprintf('%s', Lang::get('failed')));
+            $output->writeln(sprintf('%s', $e->getMessage()));
+        }
+    }
+}
diff --git a/PHPCI/Languages/lang.da.php b/PHPCI/Languages/lang.da.php
index 883e52b0..b65f9ef9 100644
--- a/PHPCI/Languages/lang.da.php
+++ b/PHPCI/Languages/lang.da.php
@@ -338,6 +338,12 @@ Kontrollér venligst nedenstående fejl før du fortsætter.',
     'create_admin_user' => 'Tilføj en administrator',
     'incorrect_format' => 'Forkert format',
 
+    // Create Build Command
+    'create_build_project' => 'Create a build for a project',
+    'project_id_argument' => 'A project ID',
+    'commit_id_option' => 'Commit ID to build',
+    'branch_name_option' => 'Branch to build',
+
     // Run Command
     'run_all_pending' => 'Kør alle PHPCI builds i køen.',
     'finding_builds' => 'Finder builds der skal køres',
diff --git a/PHPCI/Languages/lang.de.php b/PHPCI/Languages/lang.de.php
index 62504310..393459a1 100644
--- a/PHPCI/Languages/lang.de.php
+++ b/PHPCI/Languages/lang.de.php
@@ -336,6 +336,12 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab
     'create_admin_user' => 'Administratorenbenutzer erstellen',
     'incorrect_format' => 'Falsches Format',
 
+    // Create Build Command
+    'create_build_project' => 'Create a build for a project',
+    'project_id_argument' => 'A project ID',
+    'commit_id_option' => 'Commit ID to build',
+    'branch_name_option' => 'Branch to build',
+
     // Run Command
     'run_all_pending' => 'Führe alle ausstehenden PHPCI Builds aus.',
     'finding_builds' => 'Suche verarbeitbare Builds',
diff --git a/PHPCI/Languages/lang.el.php b/PHPCI/Languages/lang.el.php
index 5afc6593..e97da6d3 100644
--- a/PHPCI/Languages/lang.el.php
+++ b/PHPCI/Languages/lang.el.php
@@ -339,6 +339,12 @@ Services του Bitbucket αποθετηρίου σας.',
     'create_admin_user' => 'Δημιουργήστε ένα χρήστη διαχειριστή',
     'incorrect_format' => 'Λανθασμένη μορφοποίηση',
 
+    // Create Build Command
+    'create_build_project' => 'Create a build for a project',
+    'project_id_argument' => 'A project ID',
+    'commit_id_option' => 'Commit ID to build',
+    'branch_name_option' => 'Branch to build',
+
     // Run Command
     'run_all_pending' => 'Εκτελέστε όλες τις εκκρεμείς PHPCI κατασκευές.',
     'finding_builds' => 'Αναζήτηση κατασκευών για επεξεργασία',
diff --git a/PHPCI/Languages/lang.en.php b/PHPCI/Languages/lang.en.php
index 393ef584..19d41cbe 100644
--- a/PHPCI/Languages/lang.en.php
+++ b/PHPCI/Languages/lang.en.php
@@ -343,6 +343,12 @@ PHPCI',
     'create_admin_user' => 'Create an admin user',
     'incorrect_format' => 'Incorrect format',
 
+    // Create Build Command
+    'create_build_project' => 'Create a build for a project',
+    'project_id_argument' => 'A project ID',
+    'commit_id_option' => 'Commit ID to build',
+    'branch_name_option' => 'Branch to build',
+
     // Run Command
     'run_all_pending' => 'Run all pending PHPCI builds.',
     'finding_builds' => 'Finding builds to process',
diff --git a/PHPCI/Languages/lang.fr.php b/PHPCI/Languages/lang.fr.php
index 6965cb06..a8de5991 100644
--- a/PHPCI/Languages/lang.fr.php
+++ b/PHPCI/Languages/lang.fr.php
@@ -340,6 +340,12 @@ PHPCI',
     'create_admin_user' => 'Créer un utilisateur admin',
     'incorrect_format' => 'Format incorrect',
 
+    // Create Build Command
+    'create_build_project' => 'Créer un build projet',
+    'project_id_argument' => 'ID du projet',
+    'commit_id_option' => 'ID du commit',
+    'branch_name_option' => 'Branche',
+
     // Run Command
     'run_all_pending' => 'Démarrage de tout les builds PHPCI en attente.',
     'finding_builds' => 'Découverte des builds à traiter',
diff --git a/PHPCI/Languages/lang.it.php b/PHPCI/Languages/lang.it.php
index db6b23fc..f8f41ea8 100644
--- a/PHPCI/Languages/lang.it.php
+++ b/PHPCI/Languages/lang.it.php
@@ -342,6 +342,12 @@ PHPCI',
     'create_admin_user' => 'Crea un nuovo utente amministrarore',
     'incorrect_format' => 'Formato errato',
 
+    // Create Build Command
+    'create_build_project' => 'Create a build for a project',
+    'project_id_argument' => 'A project ID',
+    'commit_id_option' => 'Commit ID to build',
+    'branch_name_option' => 'Branch to build',
+
     // Run Command
     'run_all_pending' => 'Esegui tutte le build in attesa su PHPCI.',
     'finding_builds' => 'Ricerca delel build da processare',
diff --git a/PHPCI/Languages/lang.nl.php b/PHPCI/Languages/lang.nl.php
index 38e9466c..f3c0a7c5 100644
--- a/PHPCI/Languages/lang.nl.php
+++ b/PHPCI/Languages/lang.nl.php
@@ -340,6 +340,12 @@ Gelieve de fouten na te kijken vooraleer verder te gaan.',
     'create_admin_user' => 'Administrator-gebruiker aanmaken',
     'incorrect_format' => 'Incorrect formaat',
 
+    // Create Build Command
+    'create_build_project' => 'Create a build for a project',
+    'project_id_argument' => 'A project ID',
+    'commit_id_option' => 'Commit ID to build',
+    'branch_name_option' => 'Branch to build',
+
     // Run Command
     'run_all_pending' => 'Voer alle wachtende PHPCI builds uit.',
     'finding_builds' => 'Zoekt builds om te verwerken',
diff --git a/PHPCI/Languages/lang.pl.php b/PHPCI/Languages/lang.pl.php
index b4f8430c..37a78fb6 100644
--- a/PHPCI/Languages/lang.pl.php
+++ b/PHPCI/Languages/lang.pl.php
@@ -341,6 +341,12 @@ Przejrzyj powyższą listę błędów przed kontynuowaniem.',
     'create_admin_user' => 'Utwórz admina',
     'incorrect_format' => 'Niepoprawny format',
 
+    // Create Build Command
+    'create_build_project' => 'Create a build for a project',
+    'project_id_argument' => 'A project ID',
+    'commit_id_option' => 'Commit ID to build',
+    'branch_name_option' => 'Branch to build',
+
     // Run Command
     'run_all_pending' => 'Uruchom wszystkie oczekujące budowy w PHPCI',
     'finding_builds' => 'Szukam budów do przetwarzania.',
diff --git a/PHPCI/Languages/lang.ru.php b/PHPCI/Languages/lang.ru.php
index 931c8910..7627db85 100644
--- a/PHPCI/Languages/lang.ru.php
+++ b/PHPCI/Languages/lang.ru.php
@@ -336,6 +336,12 @@ PHPCI',
     'create_admin_user' => 'Добавить аккаунт администратора',
     'incorrect_format' => 'Неверный формат',
 
+    // Create Build Command
+    'create_build_project' => 'Create a build for a project',
+    'project_id_argument' => 'A project ID',
+    'commit_id_option' => 'Commit ID to build',
+    'branch_name_option' => 'Branch to build',
+
     // Run Command
     'run_all_pending' => 'Запустить все ожидающие PHPCI сборки.',
     'finding_builds' => 'Поиск сборок для запуска',
diff --git a/PHPCI/Languages/lang.uk.php b/PHPCI/Languages/lang.uk.php
index b080c65a..2b2cc027 100644
--- a/PHPCI/Languages/lang.uk.php
+++ b/PHPCI/Languages/lang.uk.php
@@ -340,6 +340,12 @@ PHPCI',
     'create_admin_user' => 'Створити аккаунт адміністратора',
     'incorrect_format' => 'Невірний формат',
 
+    // Create Build Command
+    'create_build_project' => 'Create a build for a project',
+    'project_id_argument' => 'A project ID',
+    'commit_id_option' => 'Commit ID to build',
+    'branch_name_option' => 'Branch to build',
+
     // Run Command
     'run_all_pending' => 'Запустити всі PHPCI збірки, які очікують.',
     'finding_builds' => 'Пошук збірок для обробки',
diff --git a/Tests/PHPCI/Command/CreateBuildCommandTest.php b/Tests/PHPCI/Command/CreateBuildCommandTest.php
new file mode 100644
index 00000000..59395de5
--- /dev/null
+++ b/Tests/PHPCI/Command/CreateBuildCommandTest.php
@@ -0,0 +1,86 @@
+getMock('PHPCI\\Model\\Project');
+
+        $projectStoreMock = $this->getMockBuilder('PHPCI\\Store\\ProjectStore')
+            ->getMock();
+        $projectStoreMock->method('getById')
+            ->will($this->returnValueMap(array(
+                array(1, 'read', $projectMock),
+                array(2, 'read', null),
+            )));
+
+        $buildServiceMock = $this->getMockBuilder('PHPCI\\Service\\BuildService')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $buildServiceMock->method('createBuild')
+            ->withConsecutive(
+                array($projectMock, null, null, null, null, null),
+                array($projectMock, '92c8c6e', null, null, null, null),
+                array($projectMock, null, 'master', null, null, null)
+            );
+
+        $this->command = $this->getMockBuilder('PHPCI\\Command\\CreateBuildCommand')
+            ->setConstructorArgs(array($projectStoreMock, $buildServiceMock))
+            ->setMethods(array('reloadConfig'))
+            ->getMock();
+
+        $this->application = new Application();
+    }
+
+    protected function getCommandTester()
+    {
+        $this->application->add($this->command);
+
+        $command = $this->application->find('phpci:create-build');
+        $commandTester = new CommandTester($command);
+
+        return $commandTester;
+    }
+
+    public function testExecute()
+    {
+        $commandTester = $this->getCommandTester();
+
+        $commandTester->execute(array('projectId' => 1));
+        $commandTester->execute(array('projectId' => 1, '--commit' => '92c8c6e'));
+        $commandTester->execute(array('projectId' => 1, '--branch' => 'master'));
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     */
+    public function testExecuteWithUnknowProjectId()
+    {
+        $commandTester = $this->getCommandTester();
+        $commandTester->execute(array('projectId' => 2));
+    }
+}
diff --git a/console b/console
index a812fc7f..36645768 100755
--- a/console
+++ b/console
@@ -20,6 +20,8 @@ use PHPCI\Command\InstallCommand;
 use PHPCI\Command\DaemonCommand;
 use PHPCI\Command\PollCommand;
 use PHPCI\Command\CreateAdminCommand;
+use PHPCI\Command\CreateBuildCommand;
+use PHPCI\Service\BuildService;
 use Symfony\Component\Console\Application;
 use b8\Store\Factory;
 
@@ -33,5 +35,6 @@ $application->add(new GenerateCommand);
 $application->add(new DaemonCommand($loggerConfig->getFor('DaemonCommand')));
 $application->add(new PollCommand($loggerConfig->getFor('PollCommand')));
 $application->add(new CreateAdminCommand(Factory::getStore('User')));
+$application->add(new CreateBuildCommand(Factory::getStore('Project'), new BuildService(Factory::getStore('Build'))));
 
 $application->run();

From 7f46b650dce96b1dbcf8af2eb765e8e4f607921b Mon Sep 17 00:00:00 2001
From: Lewis Wright 
Date: Mon, 30 Mar 2015 14:15:32 +0100
Subject: [PATCH 184/329] Added check for invalid key

Close #895
---
 PHPCI/View/Settings/index.phtml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/PHPCI/View/Settings/index.phtml b/PHPCI/View/Settings/index.phtml
index a94c0c7a..c97cbbc2 100644
--- a/PHPCI/View/Settings/index.phtml
+++ b/PHPCI/View/Settings/index.phtml
@@ -59,20 +59,20 @@
                 $returnTo = PHPCI_URL . 'settings/github-callback';
                 $githubUri = 'https://github.com/login/oauth/authorize?client_id='.$id.'&scope=repo&redirect_uri=' . $returnTo;
                 ?>
-                
-                    
      
-                        
-                    
      
-                
+                
+                    
+                        
      
+                            
+                        
      
+                    
+                        
      
+                            
 
-                
-                    
      
-                        
-
-                        
-                            
-                        
-                    
      
+                            
+                                
+                            
+                        
      
+                    
                 
             
    
 

From f25b1d25dcea411f8273f4cb40dfc94a8e0c187b Mon Sep 17 00:00:00 2001
From: Adirelle 
Date: Tue, 14 Apr 2015 12:17:52 +0200
Subject: [PATCH 185/329] Let CommandExecutor::findBinary throw an exception
 when the binary is missing.

Close #910
---
 PHPCI/Builder.php                          |  8 +++---
 PHPCI/Helper/BaseCommandExecutor.php       | 31 +++++++++++-----------
 PHPCI/Helper/CommandExecutor.php           |  7 +++--
 PHPCI/Plugin/Codeception.php               |  6 -----
 PHPCI/Plugin/Composer.php                  |  5 ----
 PHPCI/Plugin/Pdepend.php                   |  7 +----
 PHPCI/Plugin/Phing.php                     |  5 ----
 PHPCI/Plugin/PhpCodeSniffer.php            |  5 ----
 PHPCI/Plugin/PhpCpd.php                    |  7 +----
 PHPCI/Plugin/PhpCsFixer.php                |  5 ----
 PHPCI/Plugin/PhpDocblockChecker.php        |  5 ----
 PHPCI/Plugin/PhpLoc.php                    |  5 ----
 PHPCI/Plugin/PhpMessDetector.php           |  5 ----
 PHPCI/Plugin/PhpParallelLint.php           |  5 ----
 PHPCI/Plugin/PhpSpec.php                   |  5 ----
 PHPCI/Plugin/PhpUnit.php                   | 12 ---------
 PHPCI/Plugin/Xmpp.php                      |  7 +----
 Tests/PHPCI/Helper/CommandExecutorTest.php | 19 ++++++++++++-
 18 files changed, 46 insertions(+), 103 deletions(-)

diff --git a/PHPCI/Builder.php b/PHPCI/Builder.php
index b2a135f4..39e8ca41 100644
--- a/PHPCI/Builder.php
+++ b/PHPCI/Builder.php
@@ -259,12 +259,14 @@ class Builder implements LoggerAwareInterface
 
     /**
      * Find a binary required by a plugin.
-     * @param $binary
+     * @param string $binary
+     * @param bool $quiet
+     *
      * @return null|string
      */
-    public function findBinary($binary)
+    public function findBinary($binary, $quiet = false)
     {
-        return $this->commandExecutor->findBinary($binary, $this->buildPath);
+        return $this->commandExecutor->findBinary($binary, $quiet = false);
     }
 
     /**
diff --git a/PHPCI/Helper/BaseCommandExecutor.php b/PHPCI/Helper/BaseCommandExecutor.php
index 5435d597..bd948834 100644
--- a/PHPCI/Helper/BaseCommandExecutor.php
+++ b/PHPCI/Helper/BaseCommandExecutor.php
@@ -9,9 +9,9 @@
 
 namespace PHPCI\Helper;
 
-use \PHPCI\Logging\BuildLogger;
+use Exception;
+use PHPCI\Logging\BuildLogger;
 use Psr\Log\LogLevel;
-use PHPCI\Helper\Lang;
 
 /**
  * Handles running system commands with variables.
@@ -20,7 +20,7 @@ use PHPCI\Helper\Lang;
 abstract class BaseCommandExecutor implements CommandExecutor
 {
     /**
-     * @var \PHPCI\Logging\BuildLogger
+     * @var BuildLogger
      */
     protected $logger;
 
@@ -144,13 +144,12 @@ abstract class BaseCommandExecutor implements CommandExecutor
     /**
      * Find a binary required by a plugin.
      * @param string $binary
-     * @param null $buildPath
+     * @param bool $quiet
      * @return null|string
      */
-    public function findBinary($binary, $buildPath = null)
+    public function findBinary($binary, $quiet = false)
     {
-        $binaryPath = null;
-        $composerBin = $this->getComposerBinDir(realpath($buildPath));
+        $composerBin = $this->getComposerBinDir(realpath($this->buildPath));
 
         if (is_string($binary)) {
             $binary = array($binary);
@@ -161,30 +160,30 @@ abstract class BaseCommandExecutor implements CommandExecutor
 
             if (is_dir($composerBin) && is_file($composerBin.'/'.$bin)) {
                 $this->logger->log(Lang::get('found_in_path', $composerBin, $bin), LogLevel::DEBUG);
-                $binaryPath = $composerBin . '/' . $bin;
-                break;
+                return $composerBin . '/' . $bin;
             }
 
             if (is_file($this->rootDir . $bin)) {
                 $this->logger->log(Lang::get('found_in_path', 'root', $bin), LogLevel::DEBUG);
-                $binaryPath = $this->rootDir . $bin;
-                break;
+                return $this->rootDir . $bin;
             }
 
             if (is_file($this->rootDir . 'vendor/bin/' . $bin)) {
                 $this->logger->log(Lang::get('found_in_path', 'vendor/bin', $bin), LogLevel::DEBUG);
-                $binaryPath = $this->rootDir . 'vendor/bin/' . $bin;
-                break;
+                return $this->rootDir . 'vendor/bin/' . $bin;
             }
 
             $findCmdResult = $this->findGlobalBinary($bin);
             if (is_file($findCmdResult)) {
                 $this->logger->log(Lang::get('found_in_path', '', $bin), LogLevel::DEBUG);
-                $binaryPath = $findCmdResult;
-                break;
+                return $findCmdResult;
             }
         }
-        return $binaryPath;
+
+        if ($quiet) {
+            return;
+        }
+        throw new Exception(Lang::get('could_not_find', implode('/', $binary)));
     }
 
     /**
diff --git a/PHPCI/Helper/CommandExecutor.php b/PHPCI/Helper/CommandExecutor.php
index bacd1a2e..4f0028eb 100644
--- a/PHPCI/Helper/CommandExecutor.php
+++ b/PHPCI/Helper/CommandExecutor.php
@@ -26,10 +26,13 @@ interface CommandExecutor
     /**
      * Find a binary required by a plugin.
      * @param string $binary
-     * @param string $buildPath the current build path
+     * @param bool $quiet Returns null instead of throwing an execption.
+     *
      * @return null|string
+     *
+     * @throws \Exception when no binary has been found and $quiet is false.
      */
-    public function findBinary($binary, $buildPath = null);
+    public function findBinary($binary, $quiet = false);
 
     /**
      * Set the buildPath property.
diff --git a/PHPCI/Plugin/Codeception.php b/PHPCI/Plugin/Codeception.php
index 7d7fd81e..9a651bec 100644
--- a/PHPCI/Plugin/Codeception.php
+++ b/PHPCI/Plugin/Codeception.php
@@ -133,12 +133,6 @@ class Codeception implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
         } else {
             $codecept = $this->phpci->findBinary('codecept');
 
-            if (!$codecept) {
-                $this->phpci->logFailure(Lang::get('could_not_find', 'codecept'));
-
-                return false;
-            }
-
             $cmd = 'cd "%s" && ' . $codecept . ' run -c "%s" --tap ' . $this->args;
 
             if (IS_WIN) {
diff --git a/PHPCI/Plugin/Composer.php b/PHPCI/Plugin/Composer.php
index 3930f3d6..87a558fe 100644
--- a/PHPCI/Plugin/Composer.php
+++ b/PHPCI/Plugin/Composer.php
@@ -81,11 +81,6 @@ class Composer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
     {
         $composerLocation = $this->phpci->findBinary(array('composer', 'composer.phar'));
 
-        if (!$composerLocation) {
-            $this->phpci->logFailure(Lang::get('could_not_find', 'composer'));
-            return false;
-        }
-
         $cmd = '';
 
         if (IS_WIN) {
diff --git a/PHPCI/Plugin/Pdepend.php b/PHPCI/Plugin/Pdepend.php
index d1039554..73b669c1 100644
--- a/PHPCI/Plugin/Pdepend.php
+++ b/PHPCI/Plugin/Pdepend.php
@@ -79,15 +79,10 @@ class Pdepend implements \PHPCI\Plugin
 
         $pdepend = $this->phpci->findBinary('pdepend');
 
-        if (!$pdepend) {
-            $this->phpci->logFailure(Lang::get('could_not_find', 'pdepend'));
-            return false;
-        }
-
         $cmd = $pdepend . ' --summary-xml="%s" --jdepend-chart="%s" --overview-pyramid="%s" %s "%s"';
 
         $this->removeBuildArtifacts();
-       
+
         // If we need to ignore directories
         if (count($this->phpci->ignore)) {
             $ignore = ' --ignore=' . implode(',', $this->phpci->ignore);
diff --git a/PHPCI/Plugin/Phing.php b/PHPCI/Plugin/Phing.php
index 2bf64cca..3a5bd834 100644
--- a/PHPCI/Plugin/Phing.php
+++ b/PHPCI/Plugin/Phing.php
@@ -81,11 +81,6 @@ class Phing implements \PHPCI\Plugin
     {
         $phingExecutable = $this->phpci->findBinary('phing');
 
-        if (!$phingExecutable) {
-            $this->phpci->logFailure(Lang::get('could_not_find', 'phing'));
-            return false;
-        }
-
         $cmd[] = $phingExecutable . ' -f ' . $this->getBuildFilePath();
 
         if ($this->getPropertyFile()) {
diff --git a/PHPCI/Plugin/PhpCodeSniffer.php b/PHPCI/Plugin/PhpCodeSniffer.php
index df276eac..877d24c6 100644
--- a/PHPCI/Plugin/PhpCodeSniffer.php
+++ b/PHPCI/Plugin/PhpCodeSniffer.php
@@ -149,11 +149,6 @@ class PhpCodeSniffer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
 
         $phpcs = $this->phpci->findBinary('phpcs');
 
-        if (!$phpcs) {
-            $this->phpci->logFailure(PHPCI\Helper\Lang::get('could_not_find', 'phpcs'));
-            return false;
-        }
-
         $this->phpci->logExecOutput(false);
 
         $cmd = $phpcs . ' --report=json %s %s %s %s %s "%s"';
diff --git a/PHPCI/Plugin/PhpCpd.php b/PHPCI/Plugin/PhpCpd.php
index c663db5a..6433308f 100644
--- a/PHPCI/Plugin/PhpCpd.php
+++ b/PHPCI/Plugin/PhpCpd.php
@@ -90,18 +90,13 @@ class PhpCpd implements \PHPCI\Plugin
 
         $phpcpd = $this->phpci->findBinary('phpcpd');
 
-        if (!$phpcpd) {
-            $this->phpci->logFailure(Lang::get('could_not_find', 'phpcpd'));
-            return false;
-        }
-
         $tmpfilename = tempnam('/tmp', 'phpcpd');
 
         $cmd = $phpcpd . ' --log-pmd "%s" %s "%s"';
         $success = $this->phpci->executeCommand($cmd, $tmpfilename, $ignore, $this->path);
 
         print $this->phpci->getLastOutput();
-        
+
         list($errorCount, $data) = $this->processReport(file_get_contents($tmpfilename));
         $this->build->storeMeta('phpcpd-warnings', $errorCount);
         $this->build->storeMeta('phpcpd-data', $data);
diff --git a/PHPCI/Plugin/PhpCsFixer.php b/PHPCI/Plugin/PhpCsFixer.php
index 1374bc71..e07db718 100644
--- a/PHPCI/Plugin/PhpCsFixer.php
+++ b/PHPCI/Plugin/PhpCsFixer.php
@@ -69,11 +69,6 @@ class PhpCsFixer implements \PHPCI\Plugin
 
         $phpcsfixer = $this->phpci->findBinary('php-cs-fixer');
 
-        if (!$phpcsfixer) {
-            $this->phpci->logFailure(Lang::get('could_not_find', 'php-cs-fixer'));
-            return false;
-        }
-
         $cmd = $phpcsfixer . ' fix . %s %s %s';
         $success = $this->phpci->executeCommand($cmd, $this->verbose, $this->diff, $this->level);
 
diff --git a/PHPCI/Plugin/PhpDocblockChecker.php b/PHPCI/Plugin/PhpDocblockChecker.php
index 9f71afef..7fb0fe11 100644
--- a/PHPCI/Plugin/PhpDocblockChecker.php
+++ b/PHPCI/Plugin/PhpDocblockChecker.php
@@ -104,11 +104,6 @@ class PhpDocblockChecker implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
         // Check that the binary exists:
         $checker = $this->phpci->findBinary('phpdoccheck');
 
-        if (!$checker) {
-            $this->phpci->logFailure(PHPCI\Helper\Lang::get('could_not_find', 'phpdoccheck'));
-            return false;
-        }
-
         // Build ignore string:
         $ignore = '';
         if (count($this->ignore)) {
diff --git a/PHPCI/Plugin/PhpLoc.php b/PHPCI/Plugin/PhpLoc.php
index 65398e05..76887493 100644
--- a/PHPCI/Plugin/PhpLoc.php
+++ b/PHPCI/Plugin/PhpLoc.php
@@ -80,11 +80,6 @@ class PhpLoc implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
 
         $phploc = $this->phpci->findBinary('phploc');
 
-        if (!$phploc) {
-            $this->phpci->logFailure(PHPCI\Helper\Lang::get('could_not_find', 'phploc'));
-            return false;
-        }
-
         $success = $this->phpci->executeCommand($phploc . ' %s "%s"', $ignore, $this->directory);
         $output = $this->phpci->getLastOutput();
 
diff --git a/PHPCI/Plugin/PhpMessDetector.php b/PHPCI/Plugin/PhpMessDetector.php
index 21c171cb..b02f5f09 100644
--- a/PHPCI/Plugin/PhpMessDetector.php
+++ b/PHPCI/Plugin/PhpMessDetector.php
@@ -121,11 +121,6 @@ class PhpMessDetector implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
 
         $phpmdBinaryPath = $this->phpci->findBinary('phpmd');
 
-        if (!$phpmdBinaryPath) {
-            $this->phpci->logFailure(PHPCI\Helper\Lang::get('could_not_find', 'phpmd'));
-            return false;
-        }
-
         $this->executePhpMd($phpmdBinaryPath);
 
         list($errorCount, $data) = $this->processReport(trim($this->phpci->getLastOutput()));
diff --git a/PHPCI/Plugin/PhpParallelLint.php b/PHPCI/Plugin/PhpParallelLint.php
index fdaeaf65..8b7528de 100644
--- a/PHPCI/Plugin/PhpParallelLint.php
+++ b/PHPCI/Plugin/PhpParallelLint.php
@@ -78,11 +78,6 @@ class PhpParallelLint implements \PHPCI\Plugin
 
         $phplint = $this->phpci->findBinary('parallel-lint');
 
-        if (!$phplint) {
-            $this->phpci->logFailure(Lang::get('could_not_find', 'parallel-lint'));
-            return false;
-        }
-
         $cmd = $phplint . ' %s "%s"';
         $success = $this->phpci->executeCommand(
             $cmd,
diff --git a/PHPCI/Plugin/PhpSpec.php b/PHPCI/Plugin/PhpSpec.php
index 681a5a6c..e468a718 100644
--- a/PHPCI/Plugin/PhpSpec.php
+++ b/PHPCI/Plugin/PhpSpec.php
@@ -59,11 +59,6 @@ class PhpSpec implements PHPCI\Plugin
 
         $phpspec = $this->phpci->findBinary(array('phpspec', 'phpspec.php'));
 
-        if (!$phpspec) {
-            $this->phpci->logFailure(PHPCI\Helper\Lang::get('could_not_find', 'phpspec'));
-            return false;
-        }
-
         $success = $this->phpci->executeCommand($phpspec . ' --format=junit --no-code-generation run');
         $output = $this->phpci->getLastOutput();
 
diff --git a/PHPCI/Plugin/PhpUnit.php b/PHPCI/Plugin/PhpUnit.php
index 70e0e74f..7fb626df 100644
--- a/PHPCI/Plugin/PhpUnit.php
+++ b/PHPCI/Plugin/PhpUnit.php
@@ -197,15 +197,8 @@ class PhpUnit implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
                 chdir($this->phpci->buildPath.'/'.$this->runFrom);
             }
 
-
             $phpunit = $this->phpci->findBinary('phpunit');
 
-            if (!$phpunit) {
-                $this->phpci->logFailure(PHPCI\Helper\Lang::get('could_not_find', 'phpunit'));
-                return false;
-            }
-
-
             $cmd = $phpunit . ' --tap %s -c "%s" ' . $this->coverage . $this->path;
             $success = $this->phpci->executeCommand($cmd, $this->args, $this->phpci->buildPath . $configPath);
 
@@ -232,11 +225,6 @@ class PhpUnit implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
 
             $phpunit = $this->phpci->findBinary('phpunit');
 
-            if (!$phpunit) {
-                $this->phpci->logFailure(PHPCI\Helper\Lang::get('could_not_find', 'phpunit'));
-                return false;
-            }
-
             $cmd = $phpunit . ' --tap %s "%s"';
             $success = $this->phpci->executeCommand($cmd, $this->args, $this->phpci->buildPath . $directory);
             chdir($curdir);
diff --git a/PHPCI/Plugin/Xmpp.php b/PHPCI/Plugin/Xmpp.php
index add778cb..0362aa85 100644
--- a/PHPCI/Plugin/Xmpp.php
+++ b/PHPCI/Plugin/Xmpp.php
@@ -148,12 +148,7 @@ class XMPP implements \PHPCI\Plugin
     */
     public function execute()
     {
-        $sendxmpp = $this->phpci->findBinary('/usr/bin/sendxmpp');
-
-        if (!$sendxmpp) {
-            $this->phpci->logFailure('Could not find sendxmpp.');
-            return false;
-        }
+        $sendxmpp = $this->phpci->findBinary('sendxmpp');
 
         /*
          * Without recipients we can't send notification
diff --git a/Tests/PHPCI/Helper/CommandExecutorTest.php b/Tests/PHPCI/Helper/CommandExecutorTest.php
index 4cf14887..5d5dc08b 100644
--- a/Tests/PHPCI/Helper/CommandExecutorTest.php
+++ b/Tests/PHPCI/Helper/CommandExecutorTest.php
@@ -27,7 +27,8 @@ class CommandExecutorTest extends \PHPUnit_Framework_TestCase
         }
         parent::setUp();
         $mockBuildLogger = $this->prophesize('PHPCI\Logging\BuildLogger');
-        $this->testedExecutor = new UnixCommandExecutor($mockBuildLogger->reveal(), __DIR__ . "/");
+        $class = IS_WIN ? 'PHPCI\Helper\WindowsCommandExecutor' : 'PHPCI\Helper\UnixCommandExecutor';
+        $this->testedExecutor = new $class($mockBuildLogger->reveal(), __DIR__ . "/");
     }
 
     public function testGetLastOutput_ReturnsOutputOfCommand()
@@ -63,4 +64,20 @@ class CommandExecutorTest extends \PHPUnit_Framework_TestCase
         $returnValue = $this->testedExecutor->findBinary($thisFileName);
         $this->assertEquals(__DIR__ . "/" . $thisFileName, $returnValue);
     }
+
+    /**
+     * @expectedException \Exception
+     * @expectedMessageRegex WorldWidePeace
+     */
+    public function testFindBinary_ThrowsWhenNotFound()
+    {
+        $thisFileName = "WorldWidePeace";
+        $this->testedExecutor->findBinary($thisFileName);
+    }
+
+    public function testFindBinary_ReturnsNullWihQuietArgument()
+    {
+        $thisFileName = "WorldWidePeace";
+        $this->assertNull($this->testedExecutor->findBinary($thisFileName, true));
+    }
 }

From 290c34a27da14b8632bcc3a2a5cc05e68f0ab3b3 Mon Sep 17 00:00:00 2001
From: Adirelle 
Date: Tue, 14 Apr 2015 09:43:21 +0200
Subject: [PATCH 186/329] Updated the php_codesniffer required version and
 added a default phpcs.xml. Added a PHPMD configuration file. Updated
 phpci.yml to use the configuration files.

Close #913
---
 composer.json |  2 +-
 composer.lock | 18 ++++++++++++------
 phpci.yml     |  4 +++-
 phpcs.xml     | 19 +++++++++++++++++++
 phpmd.xml     | 17 +++++++++++++++++
 5 files changed, 52 insertions(+), 8 deletions(-)
 create mode 100644 phpcs.xml
 create mode 100644 phpmd.xml

diff --git a/composer.json b/composer.json
index 03d752a5..c6d8e92b 100644
--- a/composer.json
+++ b/composer.json
@@ -52,7 +52,7 @@
     "require-dev": {
         "phpunit/phpunit": "~4.5",
         "phpmd/phpmd": "~2.0",
-        "squizlabs/php_codesniffer": "~2.0",
+        "squizlabs/php_codesniffer": "~2.3",
         "block8/php-docblock-checker": "~1.0",
         "phploc/phploc": "~2.0"
     },
diff --git a/composer.lock b/composer.lock
index 60b54a4e..dbbedd22 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "0c9efd3a0b9e924c7465e03fc97ffed7",
+    "hash": "a4a95f2b83e336b9e1b285c04af26ce7",
     "packages": [
         {
             "name": "block8/b8framework",
@@ -1851,20 +1851,21 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "2.2.0",
+            "version": "2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "b301c98f19414d836fdaa678648745fcca5aeb4f"
+                "reference": "5046b0e01c416fc2b06df961d0673c85bcdc896c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/b301c98f19414d836fdaa678648745fcca5aeb4f",
-                "reference": "b301c98f19414d836fdaa678648745fcca5aeb4f",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/5046b0e01c416fc2b06df961d0673c85bcdc896c",
+                "reference": "5046b0e01c416fc2b06df961d0673c85bcdc896c",
                 "shasum": ""
             },
             "require": {
                 "ext-tokenizer": "*",
+                "ext-xmlwriter": "*",
                 "php": ">=5.1.2"
             },
             "bin": [
@@ -1872,6 +1873,11 @@
                 "scripts/phpcbf"
             ],
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
             "autoload": {
                 "classmap": [
                     "CodeSniffer.php",
@@ -1915,7 +1921,7 @@
                 "phpcs",
                 "standards"
             ],
-            "time": "2015-01-21 22:44:05"
+            "time": "2015-03-04 02:07:03"
         },
         {
             "name": "symfony/dependency-injection",
diff --git a/phpci.yml b/phpci.yml
index 8f51c88f..e794939e 100644
--- a/phpci.yml
+++ b/phpci.yml
@@ -21,8 +21,10 @@ test:
         - vendor/
   php_mess_detector:
     allowed_warnings: 0
+    rules:
+      - phpmd.xml
   php_code_sniffer:
-    standard: "PSR2"
+    standard: phpcs.xml
     allowed_warnings: 0
     allowed_errors: 0
   php_loc:
diff --git a/phpcs.xml b/phpcs.xml
new file mode 100644
index 00000000..a392a201
--- /dev/null
+++ b/phpcs.xml
@@ -0,0 +1,19 @@
+
+
+
+    Codestyle ruleset for PHPCI
+
+    
+
+    PHPCI
+
+    
+    
+
+    PHPCI/Migrations/*
+    PHPCI/Model/Base/*
+    PHPCI/Languages/*
+    Tests/*
+    vendor/*
+
+
diff --git a/phpmd.xml b/phpmd.xml
new file mode 100644
index 00000000..69b822fd
--- /dev/null
+++ b/phpmd.xml
@@ -0,0 +1,17 @@
+
+
+    
+        PHPCI rule set
+    
+
+    
+    
+    
+
+

From 81fbc6a5a0d4e4ae693f209a7bbb4a7882577310 Mon Sep 17 00:00:00 2001
From: rm3nchaca 
Date: Wed, 15 Apr 2015 15:17:06 -0500
Subject: [PATCH 187/329] fix file link in plugins

Running builds leave a file link with an error like "http://gitlab.example.com/root/project/blob/master/index.php#L6" but it is pointing to the actual file, not the file with a bug, example "http://gitlab.example.com/root/project/blob/97f0a6453d5913f4b55d660fbf2d629240ca7237/index.php#L6"

Close #915
---
 PHPCI/Model/Build/GitlabBuild.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PHPCI/Model/Build/GitlabBuild.php b/PHPCI/Model/Build/GitlabBuild.php
index 086bc046..a1e0562c 100644
--- a/PHPCI/Model/Build/GitlabBuild.php
+++ b/PHPCI/Model/Build/GitlabBuild.php
@@ -47,7 +47,7 @@ class GitlabBuild extends RemoteGitBuild
             'http://%s/%s/blob/%s/{FILE}#L{LINE}',
             $this->getProject()->getAccessInformation("domain"),
             $this->getProject()->getReference(),
-            $this->getBranch()
+            $this->getCommitId()
         );
     }
 

From f7ca64bf6de55d6556225c7207e46fe35ecdbf12 Mon Sep 17 00:00:00 2001
From: Adam Henley 
Date: Sun, 19 Apr 2015 20:32:55 +1200
Subject: [PATCH 188/329] SMTP Password not masked PR #921

Signed-off-by: Adam Henley 

Close #923
---
 PHPCI/Controller/SettingsController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PHPCI/Controller/SettingsController.php b/PHPCI/Controller/SettingsController.php
index aaaa637f..ea15bc3b 100644
--- a/PHPCI/Controller/SettingsController.php
+++ b/PHPCI/Controller/SettingsController.php
@@ -329,7 +329,7 @@ class SettingsController extends Controller
         $field->setContainerClass('form-group');
         $form->addField($field);
 
-        $field = new Form\Element\Text('smtp_password');
+        $field = new Form\Element\Password('smtp_password');
         $field->setRequired(false);
         $field->setLabel(Lang::get('smtp_password'));
         $field->setClass('form-control');

From c0568d3a4b93b104061c3ad6216b693068b35a92 Mon Sep 17 00:00:00 2001
From: Alexander Garzon 
Date: Tue, 21 Apr 2015 18:52:42 -0400
Subject: [PATCH 189/329] Update lang.es.php

Missing translation for "archived"

Close #931
---
 PHPCI/Languages/lang.es.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/PHPCI/Languages/lang.es.php b/PHPCI/Languages/lang.es.php
index 7c9f5a62..95a6eb73 100644
--- a/PHPCI/Languages/lang.es.php
+++ b/PHPCI/Languages/lang.es.php
@@ -114,6 +114,7 @@ PHPCI',
                                 (en caso que no puedas agregar el archivo phpci.yml al repositorio)',
     'default_branch' => 'Nombre de la rama por defecto',
     'allow_public_status' => '¿Activar página pública con el estado del proyecto?',
+    'archived' => 'Archivado',
     'save_project' => 'Guardar Proyecto',
 
     'error_mercurial' => 'La URL del repositorio de Mercurial debe comenzar con http:// or https://',

From 1b7f0bbb4b79500b45dedf768e332f9cf187937a Mon Sep 17 00:00:00 2001
From: corpsee 
Date: Tue, 17 Mar 2015 15:11:05 +0600
Subject: [PATCH 190/329] Improved login: now you can login using name or email

Close #873
---
 PHPCI/Controller/SessionController.php        |  4 +--
 PHPCI/Languages/lang.da.php                   |  1 +
 PHPCI/Languages/lang.de.php                   |  1 +
 PHPCI/Languages/lang.el.php                   |  1 +
 PHPCI/Languages/lang.en.php                   |  1 +
 PHPCI/Languages/lang.fr.php                   |  1 +
 PHPCI/Languages/lang.it.php                   |  1 +
 PHPCI/Languages/lang.nl.php                   |  1 +
 PHPCI/Languages/lang.pl.php                   |  1 +
 PHPCI/Languages/lang.ru.php                   |  1 +
 PHPCI/Languages/lang.uk.php                   |  1 +
 ...4958_unique_email_and_name_user_fields.php | 30 +++++++++++++++++++
 PHPCI/Store/Base/UserStoreBase.php            | 28 ++++++++++++++++-
 13 files changed, 69 insertions(+), 3 deletions(-)
 create mode 100644 PHPCI/Migrations/20150324174958_unique_email_and_name_user_fields.php

diff --git a/PHPCI/Controller/SessionController.php b/PHPCI/Controller/SessionController.php
index eb7001df..a5f40ffb 100644
--- a/PHPCI/Controller/SessionController.php
+++ b/PHPCI/Controller/SessionController.php
@@ -49,7 +49,7 @@ class SessionController extends \PHPCI\Controller
             } else {
                 unset($_SESSION['login_token']);
 
-                $user = $this->userStore->getByEmail($this->getParam('email'));
+                $user = $this->userStore->getByLoginOrEmail($this->getParam('email'));
 
                 if ($user && password_verify($this->getParam('password', ''), $user->getHash())) {
                     session_regenerate_id(true);
@@ -68,7 +68,7 @@ class SessionController extends \PHPCI\Controller
         $form->setAction(PHPCI_URL.'session/login');
 
         $email = new b8\Form\Element\Email('email');
-        $email->setLabel(Lang::get('email_address'));
+        $email->setLabel(Lang::get('login'));
         $email->setRequired(true);
         $email->setContainerClass('form-group');
         $email->setClass('form-control');
diff --git a/PHPCI/Languages/lang.da.php b/PHPCI/Languages/lang.da.php
index b65f9ef9..20e403e1 100644
--- a/PHPCI/Languages/lang.da.php
+++ b/PHPCI/Languages/lang.da.php
@@ -39,6 +39,7 @@ PHPCI',
     'reset_email_title' => 'PHPCI Adgangskode-nulstilling for %s',
     'reset_invalid' => 'Ugyldig anmodning om adgangskode-nulstilling.',
     'email_address' => 'Email-addresse',
+    'login' => 'Login / Email Address',
     'password' => 'Adgangskode',
     'log_in' => 'Log ind',
 
diff --git a/PHPCI/Languages/lang.de.php b/PHPCI/Languages/lang.de.php
index 393459a1..8a08e37d 100644
--- a/PHPCI/Languages/lang.de.php
+++ b/PHPCI/Languages/lang.de.php
@@ -39,6 +39,7 @@ PHPCI',
     'reset_email_title' => 'PHPCI Passwort zurücksetzen für %s',
     'reset_invalid' => 'Fehlerhafte Anfrage für das Zurücksetzen eines Passwortes',
     'email_address' => 'Emailadresse',
+    'login' => 'Login / Email Address',
     'password' => 'Passwort',
     'log_in' => 'Einloggen',
 
diff --git a/PHPCI/Languages/lang.el.php b/PHPCI/Languages/lang.el.php
index e97da6d3..3e3a3b84 100644
--- a/PHPCI/Languages/lang.el.php
+++ b/PHPCI/Languages/lang.el.php
@@ -39,6 +39,7 @@ PHPCI',
     'reset_email_title' => 'PHPCI Επαναφορά Κωδικού για %s',
     'reset_invalid' => 'Μη έγκυρο αίτημα επαναφοράς κωδικού πρόσβασης.',
     'email_address' => 'Διεύθυνση email',
+    'login' => 'Login / Email Address',
     'password' => 'Κωδικός πρόσβασης',
     'log_in' => 'Είσοδος',
 
diff --git a/PHPCI/Languages/lang.en.php b/PHPCI/Languages/lang.en.php
index 19d41cbe..d11a8b39 100644
--- a/PHPCI/Languages/lang.en.php
+++ b/PHPCI/Languages/lang.en.php
@@ -39,6 +39,7 @@ PHPCI',
     'reset_email_title' => 'PHPCI Password Reset for %s',
     'reset_invalid' => 'Invalid password reset request.',
     'email_address' => 'Email Address',
+    'login' => 'Login / Email Address',
     'password' => 'Password',
     'log_in' => 'Log in',
 
diff --git a/PHPCI/Languages/lang.fr.php b/PHPCI/Languages/lang.fr.php
index a8de5991..f1ad7129 100644
--- a/PHPCI/Languages/lang.fr.php
+++ b/PHPCI/Languages/lang.fr.php
@@ -39,6 +39,7 @@ PHPCI',
     'reset_email_title' => 'Réinitialisation du mot de passe PHPCI pour %s',
     'reset_invalid' => 'Requête de réinitialisation de mot de passe invalide.',
     'email_address' => 'Adresse email',
+    'login' => 'Login / Email Address',
     'password' => 'Mot de passe',
     'log_in' => 'Connexion',
 
diff --git a/PHPCI/Languages/lang.it.php b/PHPCI/Languages/lang.it.php
index f8f41ea8..ff326d14 100644
--- a/PHPCI/Languages/lang.it.php
+++ b/PHPCI/Languages/lang.it.php
@@ -39,6 +39,7 @@ PHPCI',
     'reset_email_title' => 'Ripristino della password di PHPCI per %s',
     'reset_invalid' => 'Richeista di ripristino password non valida.',
     'email_address' => 'Indirizzo Email',
+    'login' => 'Login / Email Address',
     'password' => 'Password',
     'log_in' => 'Accedi',
 
diff --git a/PHPCI/Languages/lang.nl.php b/PHPCI/Languages/lang.nl.php
index f3c0a7c5..e0638aaf 100644
--- a/PHPCI/Languages/lang.nl.php
+++ b/PHPCI/Languages/lang.nl.php
@@ -39,6 +39,7 @@ PHPCI',
     'reset_email_title' => 'PHPCI wachtwoord reset voor %s',
     'reset_invalid' => 'Ongeldig wachtwoord reset verzoek',
     'email_address' => 'E-mailadres',
+    'login' => 'Login / Email Address',
     'password' => 'Wachtwoord',
     'log_in' => 'Log in',
 
diff --git a/PHPCI/Languages/lang.pl.php b/PHPCI/Languages/lang.pl.php
index 37a78fb6..d6f95ad6 100644
--- a/PHPCI/Languages/lang.pl.php
+++ b/PHPCI/Languages/lang.pl.php
@@ -39,6 +39,7 @@ PHPCI',
     'reset_email_title' => 'Reset Hasła PHPCI dla %s',
     'reset_invalid' => 'Prośba o zmianę hasła jest nieważna.',
     'email_address' => 'Adres email',
+    'login' => 'Login / Email Address',
     'password' => 'Hasło',
     'log_in' => 'Zaloguj się',
 
diff --git a/PHPCI/Languages/lang.ru.php b/PHPCI/Languages/lang.ru.php
index 7627db85..a13c4a18 100644
--- a/PHPCI/Languages/lang.ru.php
+++ b/PHPCI/Languages/lang.ru.php
@@ -38,6 +38,7 @@ PHPCI',
     'reset_email_title' => 'Сброс пароля PHPCI для %s',
     'reset_invalid' => 'Некорректный запрос на сброс пароля.',
     'email_address' => 'Email',
+    'login' => 'Логин / Email',
     'password' => 'Пароль',
     'log_in' => 'Войти',
 
diff --git a/PHPCI/Languages/lang.uk.php b/PHPCI/Languages/lang.uk.php
index 2b2cc027..a3ca1b37 100644
--- a/PHPCI/Languages/lang.uk.php
+++ b/PHPCI/Languages/lang.uk.php
@@ -39,6 +39,7 @@ PHPCI',
     'reset_email_title' => 'Скидання пароль PHPCI для %s',
     'reset_invalid' => 'Невірний запит скидання паролю.',
     'email_address' => 'Email адреса',
+    'login' => 'Логин / Email адреса',
     'password' => 'Пароль',
     'log_in' => 'Увійти',
 
diff --git a/PHPCI/Migrations/20150324174958_unique_email_and_name_user_fields.php b/PHPCI/Migrations/20150324174958_unique_email_and_name_user_fields.php
new file mode 100644
index 00000000..f8d24ba0
--- /dev/null
+++ b/PHPCI/Migrations/20150324174958_unique_email_and_name_user_fields.php
@@ -0,0 +1,30 @@
+table('user');
+        $user_table
+            ->addIndex('email', array('unique' => true))
+            ->addIndex('name', array('unique' => true))
+            ->save();
+    }
+
+    /**
+     * Migrate Down.
+     */
+    public function down()
+    {
+        $user_table = $this->table('user');
+        $user_table
+            ->removeIndex('email', array('unique' => true))
+            ->removeIndex('name', array('unique' => true))
+            ->save();
+    }
+}
diff --git a/PHPCI/Store/Base/UserStoreBase.php b/PHPCI/Store/Base/UserStoreBase.php
index d91271d0..f2893ac5 100644
--- a/PHPCI/Store/Base/UserStoreBase.php
+++ b/PHPCI/Store/Base/UserStoreBase.php
@@ -59,7 +59,7 @@ class UserStoreBase extends Store
 
     /**
      * Returns a User model by Email.
-     * @param mixed $value
+     * @param string $value
      * @param string $useConnection
      * @throws HttpException
      * @return \@appNamespace\Model\User|null
@@ -82,4 +82,30 @@ class UserStoreBase extends Store
 
         return null;
     }
+    
+    /**
+     * Returns a User model by Email.
+     * @param string $value
+     * @param string $useConnection
+     * @throws HttpException
+     * @return \@appNamespace\Model\User|null
+     */
+    public function getByLoginOrEmail($value, $useConnection = 'read')
+    {
+        if (is_null($value)) {
+            throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.');
+        }
+
+        $query = 'SELECT * FROM `user` WHERE `name` = :value OR `email` = :value LIMIT 1';
+        $stmt = Database::getConnection($useConnection)->prepare($query);
+        $stmt->bindValue(':value', $value);
+
+        if ($stmt->execute()) {
+            if ($data = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+                return new User($data);
+            }
+        }
+
+        return null;
+    }
 }

From 634b246ed5eb4b395fecd9a282423190d9232168 Mon Sep 17 00:00:00 2001
From: corpsee 
Date: Wed, 22 Apr 2015 16:24:03 +0600
Subject: [PATCH 191/329] Fixed ru strings for create build command
 (https://github.com/Block8/PHPCI/pull/889) Fixed ru strings for 'archived'

Close #932
---
 PHPCI/Languages/lang.ru.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/PHPCI/Languages/lang.ru.php b/PHPCI/Languages/lang.ru.php
index a13c4a18..aa0f40fb 100644
--- a/PHPCI/Languages/lang.ru.php
+++ b/PHPCI/Languages/lang.ru.php
@@ -113,7 +113,7 @@ PHPCI',
                                 (если вы не добавили файл phpci.yml в репозиторий вашего проекта)',
     'default_branch' => 'Ветка по умолчанию',
     'allow_public_status' => 'Разрешить публичный статус и изображение (статуса) для проекта',
-    'archived' => 'Archived',
+    'archived' => 'Запакован',
     'save_project' => 'Сохранить проект',
 
     'error_mercurial' => 'URL репозитория Mercurial должен начинаться с http:// или https://',
@@ -338,10 +338,10 @@ PHPCI',
     'incorrect_format' => 'Неверный формат',
 
     // Create Build Command
-    'create_build_project' => 'Create a build for a project',
-    'project_id_argument' => 'A project ID',
-    'commit_id_option' => 'Commit ID to build',
-    'branch_name_option' => 'Branch to build',
+    'create_build_project' => 'Создать сборку проекта',
+    'project_id_argument' => 'ID проекта',
+    'commit_id_option' => 'ID коммита для сборки',
+    'branch_name_option' => 'Ветка для сборки',
 
     // Run Command
     'run_all_pending' => 'Запустить все ожидающие PHPCI сборки.',

From 209454c5f67e9fa8d1042b2410cd8350eeb4fcb7 Mon Sep 17 00:00:00 2001
From: Adirelle 
Date: Tue, 21 Apr 2015 14:51:55 +0200
Subject: [PATCH 192/329] When starting a manual build, replace the "Manual"
 commit id with the HEAD hash.

Close #928
---
 PHPCI/Model/Build/RemoteGitBuild.php     | 16 ++++++++--------
 PHPCI/Service/BuildService.php           |  2 ++
 Tests/PHPCI/Service/BuildServiceTest.php |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/PHPCI/Model/Build/RemoteGitBuild.php b/PHPCI/Model/Build/RemoteGitBuild.php
index 5d0c9419..faaccfb5 100644
--- a/PHPCI/Model/Build/RemoteGitBuild.php
+++ b/PHPCI/Model/Build/RemoteGitBuild.php
@@ -124,16 +124,16 @@ class RemoteGitBuild extends Build
         $success = true;
         $commit = $this->getCommitId();
 
+        $chdir = IS_WIN ? 'cd /d "%s"' : 'cd "%s"';
+
         if (!empty($commit) && $commit != 'Manual') {
-            $cmd = 'cd "%s"';
+            $cmd = $chdir . ' && git checkout %s --quiet';
+            $success = $builder->executeCommand($cmd, $cloneTo, $commit);
+        }
 
-            if (IS_WIN) {
-                $cmd = 'cd /d "%s"';
-            }
-
-            $cmd .= ' && git checkout %s --quiet';
-
-            $success = $builder->executeCommand($cmd, $cloneTo, $this->getCommitId());
+        // Always update the commit hash with the actual HEAD hash
+        if ($builder->executeCommand($chdir . ' && git rev-parse HEAD', $cloneTo)) {
+            $this->setCommitId(trim($builder->getLastOutput()));
         }
 
         return $success;
diff --git a/PHPCI/Service/BuildService.php b/PHPCI/Service/BuildService.php
index a95ac44f..ca2fae4d 100644
--- a/PHPCI/Service/BuildService.php
+++ b/PHPCI/Service/BuildService.php
@@ -9,6 +9,7 @@
 
 namespace PHPCI\Service;
 
+use PHPCI\Helper\Lang;
 use PHPCI\Model\Build;
 use PHPCI\Model\Project;
 use PHPCI\Store\BuildStore;
@@ -59,6 +60,7 @@ class BuildService
             $build->setCommitId($commitId);
         } else {
             $build->setCommitId('Manual');
+            $build->setCommitMessage(Lang::get('manual_build'));
         }
 
         if (!is_null($branch)) {
diff --git a/Tests/PHPCI/Service/BuildServiceTest.php b/Tests/PHPCI/Service/BuildServiceTest.php
index 426845a9..985f3088 100644
--- a/Tests/PHPCI/Service/BuildServiceTest.php
+++ b/Tests/PHPCI/Service/BuildServiceTest.php
@@ -57,7 +57,7 @@ class BuildServiceTest extends \PHPUnit_Framework_TestCase
         $this->assertNull($returnValue->getStarted());
         $this->assertNull($returnValue->getFinished());
         $this->assertNull($returnValue->getLog());
-        $this->assertEmpty($returnValue->getCommitMessage());
+        $this->assertEquals(\PHPCI\Helper\Lang::get('manual_build'), $returnValue->getCommitMessage());
         $this->assertNull($returnValue->getCommitterEmail());
         $this->assertNull($returnValue->getExtra());
         $this->assertEquals('master', $returnValue->getBranch());

From 408eb5b974cb1af734053d78822621bc06ddd843 Mon Sep 17 00:00:00 2001
From: Adam Cooper 
Date: Mon, 8 Sep 2014 11:45:19 +0100
Subject: [PATCH 193/329] An attempt at making the codeception plugin a little
 more complete. Codeception JS plugin and theme changes. Improvements to the
 display. Extra total information plus some test file locations.

Close #588
---
 PHPCI/Languages/lang.el.php                   |   1 +
 PHPCI/Languages/lang.en.php                   |   6 +
 PHPCI/Plugin/Codeception.php                  | 178 ++++++++++--------
 .../Util/TestResultParsers/Codeception.php    | 108 +++++++++++
 .../TestResultParsers/ParserInterface.php     |  16 ++
 public/assets/css/bootstrap-theme.min.css     |   4 +-
 public/assets/css/bootstrap.min.css           |   4 +-
 public/assets/js/bootstrap.min.js             |   8 +-
 public/assets/js/build-plugins/codeception.js |  72 +++++--
 9 files changed, 294 insertions(+), 103 deletions(-)
 create mode 100644 PHPCI/Plugin/Util/TestResultParsers/Codeception.php
 create mode 100644 PHPCI/Plugin/Util/TestResultParsers/ParserInterface.php

diff --git a/PHPCI/Languages/lang.el.php b/PHPCI/Languages/lang.el.php
index 3e3a3b84..cb7d169f 100644
--- a/PHPCI/Languages/lang.el.php
+++ b/PHPCI/Languages/lang.el.php
@@ -172,6 +172,7 @@ Services του Bitbucket αποθετηρίου σας.',
     'codeception_errors' => 'Λάθη Codeception',
     'phpmd_warnings' => 'Προειδοποιήσεις PHPMD',
     'phpcs_warnings' => 'Προειδοποιήσεις PHPCS ',
+    'codeception_errors' => 'Λάθη Codeception',
     'phpcs_errors' => 'Λάθη PHPCS',
     'phplint_errors' => 'Λάθη Lint',
     'phpunit_errors' => 'Λάθη PHPUnit ',
diff --git a/PHPCI/Languages/lang.en.php b/PHPCI/Languages/lang.en.php
index d11a8b39..d6c48754 100644
--- a/PHPCI/Languages/lang.en.php
+++ b/PHPCI/Languages/lang.en.php
@@ -190,6 +190,12 @@ PHPCI',
     'technical_debt' => 'Technical Debt',
     'behat' => 'Behat',
 
+    'codeception_feature' => 'Feature',
+    'codeception_suite' => 'Suite',
+    'codeception_time' => 'Time',
+    'codeception_synopsis' => '%1$d tests carried out in %2$f seconds.
+                               %3$d failures.',
+
     'file' => 'File',
     'line' => 'Line',
     'class' => 'Class',
diff --git a/PHPCI/Plugin/Codeception.php b/PHPCI/Plugin/Codeception.php
index 9a651bec..fe12db76 100644
--- a/PHPCI/Plugin/Codeception.php
+++ b/PHPCI/Plugin/Codeception.php
@@ -9,50 +9,76 @@
 
 namespace PHPCI\Plugin;
 
-use PHPCI;
 use PHPCI\Builder;
 use PHPCI\Helper\Lang;
 use PHPCI\Model\Build;
-use PHPCI\Plugin\Util\TapParser;
+use PHPCI\Plugin\Util\TestResultParsers\Codeception as Parser;
+use Psr\Log\LogLevel;
 
 /**
- * Codeception Plugin - Enables full acceptance, unit, and functional testing
- *
+ * Codeception Plugin - Enables full acceptance, unit, and functional testing.
  * @author       Don Gilbert 
  * @author       Igor Timoshenko 
+ * @author       Adam Cooper 
  * @package      PHPCI
  * @subpackage   Plugins
  */
-class Codeception implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
+class Codeception implements \PHPCI\Plugin, \PHPCI\ZeroConfigPlugin
 {
-    /**
-     * @var string
-     */
+    /** @var string */
     protected $args = '';
 
-    /**
-     * @var Build
-     */
+    /** @var Builder */
+    protected $phpci;
+
+    /** @var Build */
     protected $build;
 
     /**
-     * @var Builder
+     * @var string $ymlConfigFile The path of a yml config for Codeception
      */
-    protected $phpci;
+    protected $ymlConfigFile;
 
     /**
-     * @var string|string[] The path (or array of paths) of an yml config for Codeception
+     * @var string $path The path to the codeception tests folder.
      */
-    protected $configFile;
+    protected $path;
 
     /**
-     * @var string The path where the reports and logs are stored
+     * @param $stage
+     * @param Builder $builder
+     * @param Build $build
+     * @return bool
      */
-    protected $logPath = 'tests/_output';
+    public static function canExecute($stage, Builder $builder, Build $build)
+    {
+        if ($stage == 'test' && !is_null(self::findConfigFile($builder->buildPath))) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Try and find the codeception YML config file.
+     * @param $buildPath
+     * @return null|string
+     */
+    public static function findConfigFile($buildPath)
+    {
+        if (file_exists($buildPath . 'codeception.yml')) {
+            return 'codeception.yml';
+        }
+
+        if (file_exists($buildPath . 'codeception.dist.yml')) {
+            return 'codeception.dist.yml';
+        }
+
+        return null;
+    }
 
     /**
      * Set up the plugin, configure options, etc.
-     *
      * @param Builder $phpci
      * @param Build $build
      * @param array $options
@@ -61,104 +87,96 @@ class Codeception implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
     {
         $this->phpci = $phpci;
         $this->build = $build;
+        $this->path = 'tests/';
 
-        if (isset($options['config'])) {
-            $this->configFile = $options['config'];
+        if (empty($options['config'])) {
+            $this->ymlConfigFile = self::findConfigFile($this->phpci->buildPath);
+        }
+        if (isset($options['config'])) {
+            $this->ymlConfigFile = $options['config'];
         }
-
         if (isset($options['args'])) {
             $this->args = (string) $options['args'];
         }
-
-        if (isset($options['log_path'])) {
-            $this->logPath = $options['log_path'];
+        if (isset($options['path'])) {
+            $this->path = $options['path'];
         }
     }
 
     /**
-     * {@inheritDoc}
+     * Runs Codeception tests, optionally using specified config file(s).
      */
     public function execute()
     {
+        if (empty($this->ymlConfigFile)) {
+            $this->phpci->logFailure('No configuration file found');
+            return false;
+        }
+
         $success = true;
 
-        $this->phpci->logExecOutput(false);
-
-        // Run any config files first. This can be either a single value or an array
-        if ($this->configFile !== null) {
-            $success &= $this->runConfigFile($this->configFile);
-        }
-
-        $tapString = file_get_contents(
-            $this->phpci->buildPath . $this->logPath . DIRECTORY_SEPARATOR . 'report.tap.log'
-        );
-
-        try {
-            $tapParser = new TapParser($tapString);
-            $output = $tapParser->parse();
-        } catch (\Exception $ex) {
-            $this->phpci->logFailure($tapString);
-
-            throw $ex;
-        }
-
-        $failures = $tapParser->getTotalFailures();
-
-        $this->build->storeMeta('codeception-errors', $failures);
-        $this->build->storeMeta('codeception-data', $output);
-
-        $this->phpci->logExecOutput(true);
+        // Run any config files first. This can be either a single value or an array.
+        $success &= $this->runConfigFile($this->ymlConfigFile);
 
         return $success;
     }
 
     /**
-     * {@inheritDoc}
-     */
-    public static function canExecute($stage, Builder $builder, Build $build)
-    {
-        return $stage === 'test';
-    }
-
-    /**
-     * Run tests from a Codeception config file
-     *
-     * @param string $configPath
+     * Run tests from a Codeception config file.
+     * @param $configPath
      * @return bool|mixed
+     * @throws \Exception
      */
     protected function runConfigFile($configPath)
     {
         if (is_array($configPath)) {
             return $this->recurseArg($configPath, array($this, 'runConfigFile'));
         } else {
+            $this->phpci->logExecOutput(false);
+
             $codecept = $this->phpci->findBinary('codecept');
 
-            $cmd = 'cd "%s" && ' . $codecept . ' run -c "%s" --tap ' . $this->args;
+            if (!$codecept) {
+                $this->phpci->logFailure(Lang::get('could_not_find', 'codecept'));
 
+                return false;
+            }
+
+            $cmd = 'cd "%s" && ' . $codecept . ' run -c "%s" --xml ' . $this->args;
             if (IS_WIN) {
-                $cmd = 'cd /d "%s" && ' . $codecept . ' run -c "%s" --tap ' . $this->args;
+                $cmd = 'cd /d "%s" && ' . $codecept . ' run -c "%s" --xml ' . $this->args;
             }
 
             $configPath = $this->phpci->buildPath . $configPath;
             $success = $this->phpci->executeCommand($cmd, $this->phpci->buildPath, $configPath);
 
+
+            $this->phpci->log(
+                'Codeception XML path: '. $this->phpci->buildPath . $this->path . '_output/report.xml',
+                Loglevel::DEBUG
+            );
+            $xml = file_get_contents($this->phpci->buildPath . $this->path . '_output/report.xml', false);
+
+            try {
+                $parser = new Parser($this->phpci, $xml);
+                $output = $parser->parse();
+            } catch (\Exception $ex) {
+                throw $ex;
+            }
+
+            $meta = array(
+                'tests' => $parser->getTotalTests(),
+                'timetaken' => $parser->getTotalTimeTaken(),
+                'failures' => $parser->getTotalFailures()
+            );
+
+            $this->build->storeMeta('codeception-meta', $meta);
+            $this->build->storeMeta('codeception-data', $output);
+            $this->build->storeMeta('codeception-errors', $parser->getTotalFailures());
+
+            $this->phpci->logExecOutput(true);
+
             return $success;
         }
     }
-
-    /**
-     * @param array $array
-     * @param \Callback $callable
-     * @return bool|mixed
-     */
-    protected function recurseArg(array $array, $callable)
-    {
-        $success = true;
-
-        foreach ($array as $subItem) {
-            $success &= call_user_func($callable, $subItem);
-        }
-
-        return $success;
-    }
 }
diff --git a/PHPCI/Plugin/Util/TestResultParsers/Codeception.php b/PHPCI/Plugin/Util/TestResultParsers/Codeception.php
new file mode 100644
index 00000000..39f1ce6f
--- /dev/null
+++ b/PHPCI/Plugin/Util/TestResultParsers/Codeception.php
@@ -0,0 +1,108 @@
+
+ * @package PHPCI\Plugin\Util\TestResultParsers
+ */
+class Codeception implements ParserInterface
+{
+    protected $phpci;
+    protected $resultsXml;
+
+    protected $results;
+
+    protected $totalTests;
+    protected $totalTimeTaken;
+    protected $totalFailures;
+
+    /**
+     * @param Builder $phpci
+     * @param $resultsXml
+     */
+    public function __construct(Builder $phpci, $resultsXml)
+    {
+        $this->phpci = $phpci;
+        $this->resultsXml = $resultsXml;
+
+        $this->totalTests = 0;
+    }
+
+    /**
+     * @return array An array of key/value pairs for storage in the plugins result metadata
+     */
+    public function parse()
+    {
+        $rtn = array();
+
+        $this->results = new \SimpleXMLElement($this->resultsXml);
+
+        // calculate total results
+        foreach ($this->results->testsuite as $testsuite) {
+            $this->totalTests += (int) $testsuite['tests'];
+            $this->totalTimeTaken += (float) $testsuite['time'];
+            $this->totalFailures += (int) $testsuite['failures'];
+
+            foreach ($testsuite->testcase as $testcase) {
+                $testresult = array(
+                    'suite' => (string) $testsuite['name'],
+                    'file' => str_replace($this->phpci->buildPath, '/', (string) $testcase['file']),
+                    'name' => (string) $testcase['name'],
+                    'feature' => (string) $testcase['feature'],
+                    'assertions' => (int) $testcase['assertions'],
+                    'time' => (float) $testcase['time']
+                );
+
+                if (isset($testcase['class'])) {
+                    $testresult['class'] = (string) $testcase['class'];
+                }
+
+                if (isset($testcase->failure)) {
+                    $testresult['pass'] = false;
+                    $testresult['message'] = (string) $testcase->failure;
+                } else {
+                    $testresult['pass'] = true;
+                }
+
+                $rtn[] = $testresult;
+            }
+        }
+
+        return $rtn;
+    }
+
+    /**
+     * Get the total number of tests performed.
+     *
+     * @return int
+     */
+    public function getTotalTests()
+    {
+        return $this->totalTests;
+    }
+
+    /**
+     * The time take to complete all tests
+     *
+     * @return mixed
+     */
+    public function getTotalTimeTaken()
+    {
+        return $this->totalTimeTaken;
+    }
+
+    /**
+     * A count of the test failures
+     *
+     * @return mixed
+     */
+    public function getTotalFailures()
+    {
+        return $this->totalFailures;
+    }
+}
diff --git a/PHPCI/Plugin/Util/TestResultParsers/ParserInterface.php b/PHPCI/Plugin/Util/TestResultParsers/ParserInterface.php
new file mode 100644
index 00000000..d0c77cb7
--- /dev/null
+++ b/PHPCI/Plugin/Util/TestResultParsers/ParserInterface.php
@@ -0,0 +1,16 @@
+li>a:hover,.dropdown-menu>li>a:focus{background-image:-webkit-linear-gradient(top, #f5f5f5 0, #e8e8e8 100%);background-image:linear-gradient(to bottom, #f5f5f5 0, #e8e8e8 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);background-color:#e8e8e8}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{background-image:-webkit-linear-gradient(top, #428bca 0, #357ebd 100%);background-image:linear-gradient(to bottom, #428bca 0, #357ebd 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);background-color:#357ebd}.navbar-default{background-image:-webkit-linear-gradient(top, #fff 0, #f8f8f8 100%);background-image:linear-gradient(to bottom, #fff 0, #f8f8f8 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 5px rgba(0,0,0,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 5px rgba(0,0,0,0.075)}.navbar-default .navbar-nav>.active>a{background-image:-webkit-linear-gradient(top, #ebebeb 0, #f3f3f3 100%);background-image:linear-gradient(to bottom, #ebebeb 0, #f3f3f3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff3f3f3', GradientType=0);-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,0.075);box-shadow:inset 0 3px 9px rgba(0,0,0,0.075)}.navbar-brand,.navbar-nav>li>a{text-shadow:0 1px 0 rgba(255,255,255,0.25)}.navbar-inverse{background-image:-webkit-linear-gradient(top, #3c3c3c 0, #222 100%);background-image:linear-gradient(to bottom, #3c3c3c 0, #222 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.navbar-inverse .navbar-nav>.active>a{background-image:-webkit-linear-gradient(top, #222 0, #282828 100%);background-image:linear-gradient(to bottom, #222 0, #282828 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff282828', GradientType=0);-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,0.25);box-shadow:inset 0 3px 9px rgba(0,0,0,0.25)}.navbar-inverse .navbar-brand,.navbar-inverse .navbar-nav>li>a{text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.navbar-static-top,.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}.alert{text-shadow:0 1px 0 rgba(255,255,255,0.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.25),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.25),0 1px 2px rgba(0,0,0,0.05)}.alert-success{background-image:-webkit-linear-gradient(top, #dff0d8 0, #c8e5bc 100%);background-image:linear-gradient(to bottom, #dff0d8 0, #c8e5bc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);border-color:#b2dba1}.alert-info{background-image:-webkit-linear-gradient(top, #d9edf7 0, #b9def0 100%);background-image:linear-gradient(to bottom, #d9edf7 0, #b9def0 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);border-color:#9acfea}.alert-warning{background-image:-webkit-linear-gradient(top, #fcf8e3 0, #f8efc0 100%);background-image:linear-gradient(to bottom, #fcf8e3 0, #f8efc0 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);border-color:#f5e79e}.alert-danger{background-image:-webkit-linear-gradient(top, #f2dede 0, #e7c3c3 100%);background-image:linear-gradient(to bottom, #f2dede 0, #e7c3c3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);border-color:#dca7a7}.progress{background-image:-webkit-linear-gradient(top, #ebebeb 0, #f5f5f5 100%);background-image:linear-gradient(to bottom, #ebebeb 0, #f5f5f5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0)}.progress-bar{background-image:-webkit-linear-gradient(top, #428bca 0, #3071a9 100%);background-image:linear-gradient(to bottom, #428bca 0, #3071a9 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0)}.progress-bar-success{background-image:-webkit-linear-gradient(top, #5cb85c 0, #449d44 100%);background-image:linear-gradient(to bottom, #5cb85c 0, #449d44 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0)}.progress-bar-info{background-image:-webkit-linear-gradient(top, #5bc0de 0, #31b0d5 100%);background-image:linear-gradient(to bottom, #5bc0de 0, #31b0d5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0)}.progress-bar-warning{background-image:-webkit-linear-gradient(top, #f0ad4e 0, #ec971f 100%);background-image:linear-gradient(to bottom, #f0ad4e 0, #ec971f 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0)}.progress-bar-danger{background-image:-webkit-linear-gradient(top, #d9534f 0, #c9302c 100%);background-image:linear-gradient(to bottom, #d9534f 0, #c9302c 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0)}.list-group{border-radius:4px;-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.075);box-shadow:0 1px 2px rgba(0,0,0,0.075)}.list-group-item.active,.list-group-item.active:hover,.list-group-item.active:focus{text-shadow:0 -1px 0 #3071a9;background-image:-webkit-linear-gradient(top, #428bca 0, #3278b3 100%);background-image:linear-gradient(to bottom, #428bca 0, #3278b3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3278b3', GradientType=0);border-color:#3278b3}.panel{-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.05);box-shadow:0 1px 2px rgba(0,0,0,0.05)}.panel-default>.box-header{background-image:-webkit-linear-gradient(top, #f5f5f5 0, #e8e8e8 100%);background-image:linear-gradient(to bottom, #f5f5f5 0, #e8e8e8 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0)}.panel-primary>.box-header{background-image:-webkit-linear-gradient(top, #428bca 0, #357ebd 100%);background-image:linear-gradient(to bottom, #428bca 0, #357ebd 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0)}.panel-success>.box-header{background-image:-webkit-linear-gradient(top, #dff0d8 0, #d0e9c6 100%);background-image:linear-gradient(to bottom, #dff0d8 0, #d0e9c6 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0)}.panel-info>.box-header{background-image:-webkit-linear-gradient(top, #d9edf7 0, #c4e3f3 100%);background-image:linear-gradient(to bottom, #d9edf7 0, #c4e3f3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0)}.panel-warning>.box-header{background-image:-webkit-linear-gradient(top, #fcf8e3 0, #faf2cc 100%);background-image:linear-gradient(to bottom, #fcf8e3 0, #faf2cc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0)}.panel-danger>.box-header{background-image:-webkit-linear-gradient(top, #f2dede 0, #ebcccc 100%);background-image:linear-gradient(to bottom, #f2dede 0, #ebcccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0)}.well{background-image:-webkit-linear-gradient(top, #e8e8e8 0, #f5f5f5 100%);background-image:linear-gradient(to bottom, #e8e8e8 0, #f5f5f5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);border-color:#dcdcdc;-webkit-box-shadow:inset 0 1px 3px rgba(0,0,0,0.05),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 3px rgba(0,0,0,0.05),0 1px 0 rgba(255,255,255,0.1)}
\ No newline at end of file
+.btn-default,.btn-primary,.btn-success,.btn-info,.btn-warning,.btn-danger{text-shadow:0 -1px 0 rgba(0,0,0,0.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 1px rgba(0,0,0,0.075)}.btn-default:active,.btn-primary:active,.btn-success:active,.btn-info:active,.btn-warning:active,.btn-danger:active,.btn-default.active,.btn-primary.active,.btn-success.active,.btn-info.active,.btn-warning.active,.btn-danger.active{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn:active,.btn.active{background-image:none}.btn-default{background-image:-webkit-linear-gradient(top, #fff 0, #e0e0e0 100%);background-image:linear-gradient(to bottom, #fff 0, #e0e0e0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background-repeat:repeat-x;border-color:#dbdbdb;text-shadow:0 1px 0 #fff;border-color:#ccc}.btn-default:hover,.btn-default:focus{background-color:#e0e0e0;background-position:0 -15px}.btn-default:active,.btn-default.active{background-color:#e0e0e0;border-color:#dbdbdb}.btn-primary{background-image:-webkit-linear-gradient(top, #428bca 0, #2d6ca2 100%);background-image:linear-gradient(to bottom, #428bca 0, #2d6ca2 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff2d6ca2', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background-repeat:repeat-x;border-color:#2b669a}.btn-primary:hover,.btn-primary:focus{background-color:#2d6ca2;background-position:0 -15px}.btn-primary:active,.btn-primary.active{background-color:#2d6ca2;border-color:#2b669a}.btn-success{background-image:-webkit-linear-gradient(top, #5cb85c 0, #419641 100%);background-image:linear-gradient(to bottom, #5cb85c 0, #419641 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff419641', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background-repeat:repeat-x;border-color:#3e8f3e}.btn-success:hover,.btn-success:focus{background-color:#419641;background-position:0 -15px}.btn-success:active,.btn-success.active{background-color:#419641;border-color:#3e8f3e}.btn-info{background-image:-webkit-linear-gradient(top, #5bc0de 0, #2aabd2 100%);background-image:linear-gradient(to bottom, #5bc0de 0, #2aabd2 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background-repeat:repeat-x;border-color:#28a4c9}.btn-info:hover,.btn-info:focus{background-color:#2aabd2;background-position:0 -15px}.btn-info:active,.btn-info.active{background-color:#2aabd2;border-color:#28a4c9}.btn-warning{background-image:-webkit-linear-gradient(top, #f0ad4e 0, #eb9316 100%);background-image:linear-gradient(to bottom, #f0ad4e 0, #eb9316 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffeb9316', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background-repeat:repeat-x;border-color:#e38d13}.btn-warning:hover,.btn-warning:focus{background-color:#eb9316;background-position:0 -15px}.btn-warning:active,.btn-warning.active{background-color:#eb9316;border-color:#e38d13}.btn-danger{background-image:-webkit-linear-gradient(top, #d9534f 0, #c12e2a 100%);background-image:linear-gradient(to bottom, #d9534f 0, #c12e2a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc12e2a', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background-repeat:repeat-x;border-color:#b92c28}.btn-danger:hover,.btn-danger:focus{background-color:#c12e2a;background-position:0 -15px}.btn-danger:active,.btn-danger.active{background-color:#c12e2a;border-color:#b92c28}.thumbnail,.img-thumbnail{-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.075);box-shadow:0 1px 2px rgba(0,0,0,0.075)}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{background-image:-webkit-linear-gradient(top, #f5f5f5 0, #e8e8e8 100%);background-image:linear-gradient(to bottom, #f5f5f5 0, #e8e8e8 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);background-color:#e8e8e8}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{background-image:-webkit-linear-gradient(top, #428bca 0, #357ebd 100%);background-image:linear-gradient(to bottom, #428bca 0, #357ebd 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);background-color:#357ebd}.navbar-default{background-image:-webkit-linear-gradient(top, #fff 0, #f8f8f8 100%);background-image:linear-gradient(to bottom, #fff 0, #f8f8f8 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 5px rgba(0,0,0,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 5px rgba(0,0,0,0.075)}.navbar-default .navbar-nav>.active>a{background-image:-webkit-linear-gradient(top, #ebebeb 0, #f3f3f3 100%);background-image:linear-gradient(to bottom, #ebebeb 0, #f3f3f3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff3f3f3', GradientType=0);-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,0.075);box-shadow:inset 0 3px 9px rgba(0,0,0,0.075)}.navbar-brand,.navbar-nav>li>a{text-shadow:0 1px 0 rgba(255,255,255,0.25)}.navbar-inverse{background-image:-webkit-linear-gradient(top, #3c3c3c 0, #222 100%);background-image:linear-gradient(to bottom, #3c3c3c 0, #222 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.navbar-inverse .navbar-nav>.active>a{background-image:-webkit-linear-gradient(top, #222 0, #282828 100%);background-image:linear-gradient(to bottom, #222 0, #282828 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff282828', GradientType=0);-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,0.25);box-shadow:inset 0 3px 9px rgba(0,0,0,0.25)}.navbar-inverse .navbar-brand,.navbar-inverse .navbar-nav>li>a{text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.navbar-static-top,.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}.alert{text-shadow:0 1px 0 rgba(255,255,255,0.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.25),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.25),0 1px 2px rgba(0,0,0,0.05)}.alert-success{background-image:-webkit-linear-gradient(top, #dff0d8 0, #c8e5bc 100%);background-image:linear-gradient(to bottom, #dff0d8 0, #c8e5bc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);border-color:#b2dba1}.alert-info{background-image:-webkit-linear-gradient(top, #d9edf7 0, #b9def0 100%);background-image:linear-gradient(to bottom, #d9edf7 0, #b9def0 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);border-color:#9acfea}.alert-warning{background-image:-webkit-linear-gradient(top, #fcf8e3 0, #f8efc0 100%);background-image:linear-gradient(to bottom, #fcf8e3 0, #f8efc0 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);border-color:#f5e79e}.alert-danger{background-image:-webkit-linear-gradient(top, #f2dede 0, #e7c3c3 100%);background-image:linear-gradient(to bottom, #f2dede 0, #e7c3c3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);border-color:#dca7a7}.progress{background-image:-webkit-linear-gradient(top, #ebebeb 0, #f5f5f5 100%);background-image:linear-gradient(to bottom, #ebebeb 0, #f5f5f5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0)}.progress-bar{background-image:-webkit-linear-gradient(top, #428bca 0, #3071a9 100%);background-image:linear-gradient(to bottom, #428bca 0, #3071a9 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0)}.progress-bar-success{background-image:-webkit-linear-gradient(top, #5cb85c 0, #449d44 100%);background-image:linear-gradient(to bottom, #5cb85c 0, #449d44 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0)}.progress-bar-info{background-image:-webkit-linear-gradient(top, #5bc0de 0, #31b0d5 100%);background-image:linear-gradient(to bottom, #5bc0de 0, #31b0d5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0)}.progress-bar-warning{background-image:-webkit-linear-gradient(top, #f0ad4e 0, #ec971f 100%);background-image:linear-gradient(to bottom, #f0ad4e 0, #ec971f 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0)}.progress-bar-danger{background-image:-webkit-linear-gradient(top, #d9534f 0, #c9302c 100%);background-image:linear-gradient(to bottom, #d9534f 0, #c9302c 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0)}.list-group{border-radius:4px;-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.075);box-shadow:0 1px 2px rgba(0,0,0,0.075)}.list-group-item.active,.list-group-item.active:hover,.list-group-item.active:focus{text-shadow:0 -1px 0 #3071a9;background-image:-webkit-linear-gradient(top, #428bca 0, #3278b3 100%);background-image:linear-gradient(to bottom, #428bca 0, #3278b3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3278b3', GradientType=0);border-color:#3278b3}.panel{-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.05);box-shadow:0 1px 2px rgba(0,0,0,0.05)}.panel-default>.box-header{background-image:-webkit-linear-gradient(top, #f5f5f5 0, #e8e8e8 100%);background-image:linear-gradient(to bottom, #f5f5f5 0, #e8e8e8 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0)}.panel-primary>.box-header{background-image:-webkit-linear-gradient(top, #428bca 0, #357ebd 100%);background-image:linear-gradient(to bottom, #428bca 0, #357ebd 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0)}.panel-success>.box-header{background-image:-webkit-linear-gradient(top, #dff0d8 0, #d0e9c6 100%);background-image:linear-gradient(to bottom, #dff0d8 0, #d0e9c6 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0)}.panel-info>.box-header{background-image:-webkit-linear-gradient(top, #d9edf7 0, #c4e3f3 100%);background-image:linear-gradient(to bottom, #d9edf7 0, #c4e3f3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0)}.panel-warning>.box-header{background-image:-webkit-linear-gradient(top, #fcf8e3 0, #faf2cc 100%);background-image:linear-gradient(to bottom, #fcf8e3 0, #faf2cc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0)}.panel-danger>.box-header{background-image:-webkit-linear-gradient(top, #f2dede 0, #ebcccc 100%);background-image:linear-gradient(to bottom, #f2dede 0, #ebcccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0)}.well{background-image:-webkit-linear-gradient(top, #e8e8e8 0, #f5f5f5 100%);background-image:linear-gradient(to bottom, #e8e8e8 0, #f5f5f5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);border-color:#dcdcdc;-webkit-box-shadow:inset 0 1px 3px rgba(0,0,0,0.05),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 3px rgba(0,0,0,0.05),0 1px 0 rgba(255,255,255,0.1)}
diff --git a/public/assets/css/bootstrap.min.css b/public/assets/css/bootstrap.min.css
index 7af7ea7c..7e029af9 100755
--- a/public/assets/css/bootstrap.min.css
+++ b/public/assets/css/bootstrap.min.css
@@ -1,7 +1,7 @@
 /*!
- * Bootstrap v3.1.1 (http://getbootstrap.com)
+ * Bootstrap v3.2.0 (http://getbootstrap.com)
  * Copyright 2011-2014 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
 
-/*! normalize.css v3.0.0 | MIT License | git.io/normalize */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}h1{font-size:2em;margin:0.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace, monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}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,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:bold}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}@media print{*{text-shadow:none !important;color:#000 !important;background:transparent !important;box-shadow:none !important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100% !important}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}select{background:#fff !important}.navbar{display:none}.table td,.table th{background-color:#fff !important}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000 !important}.label{border:1px solid #000}.table{border-collapse:collapse !important}.table-bordered th,.table-bordered td{border:1px solid #ddd !important}}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:62.5%;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#428bca;text-decoration:none}a:hover,a:focus{color:#2a6496;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.img-responsive{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out;display:inline-block;max-width:100%;height:auto}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,.h1 small,.h2 small,.h3 small,.h4 small,.h5 small,.h6 small,h1 .small,h2 .small,h3 .small,h4 .small,h5 .small,h6 .small,.h1 .small,.h2 .small,.h3 .small,.h4 .small,.h5 .small,.h6 .small{font-weight:normal;line-height:1;color:#999}h1,.h1,h2,.h2,h3,.h3{margin-top:20px;margin-bottom:10px}h1 small,.h1 small,h2 small,.h2 small,h3 small,.h3 small,h1 .small,.h1 .small,h2 .small,.h2 .small,h3 .small,.h3 .small{font-size:65%}h4,.h4,h5,.h5,h6,.h6{margin-top:10px;margin-bottom:10px}h4 small,.h4 small,h5 small,.h5 small,h6 small,.h6 small,h4 .small,.h4 .small,h5 .small,.h5 .small,h6 .small,.h6 .small{font-size:75%}h1,.h1{font-size:36px}h2,.h2{font-size:30px}h3,.h3{font-size:24px}h4,.h4{font-size:18px}h5,.h5{font-size:14px}h6,.h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:200;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}small,.small{font-size:85%}cite{font-style:normal}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-muted{color:#999}.text-primary{color:#428bca}a.text-primary:hover{color:#3071a9}.text-success{color:#3c763d}a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#428bca}a.bg-primary:hover{background-color:#3071a9}.bg-success{background-color:#dff0d8}a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ul,ol{margin-top:0;margin-bottom:10px}ul ul,ol ul,ul ol,ol ol{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;list-style:none;margin-left:-5px}.list-inline>li{display:inline-block;padding-left:5px;padding-right:5px}dl{margin-top:0;margin-bottom:20px}dt,dd{line-height:1.42857143}dt{font-weight:bold}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;clear:left;text-align:right;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote p:last-child,blockquote ul:last-child,blockquote ol:last-child{margin-bottom:0}blockquote footer,blockquote small,blockquote .small{display:block;font-size:80%;line-height:1.42857143;color:#999}blockquote footer:before,blockquote small:before,blockquote .small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0;text-align:right}.blockquote-reverse footer:before,blockquote.pull-right footer:before,.blockquote-reverse small:before,blockquote.pull-right small:before,.blockquote-reverse .small:before,blockquote.pull-right .small:before{content:''}.blockquote-reverse footer:after,blockquote.pull-right footer:after,.blockquote-reverse small:after,blockquote.pull-right small:after,.blockquote-reverse .small:after,blockquote.pull-right .small:after{content:'\00A0 \2014'}blockquote:before,blockquote:after{content:""}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;white-space:nowrap;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;box-shadow:inset 0 -1px 0 rgba(0,0,0,0.25)}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;word-break:break-all;word-wrap:break-word;color:#333;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px}.row{margin-left:-15px;margin-right:-15px}.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12{position:relative;min-height:1px;padding-left:15px;padding-right:15px}.col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:0}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:0}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:0}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:0}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:0}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:0}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:0}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:0}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{max-width:100%;background-color:transparent}th{text-align:left}.table{width:100%;margin-bottom:20px}.table>thead>tr>th,.table>tbody>tr>th,.table>tfoot>tr>th,.table>thead>tr>td,.table>tbody>tr>td,.table>tfoot>tr>td{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>th,.table>caption+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>td,.table>thead:first-child>tr:first-child>td{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>thead>tr>th,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>tbody>tr>td,.table-condensed>tfoot>tr>td{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>tbody>tr>td,.table-bordered>tfoot>tr>td{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>thead>tr>td{border-bottom-width:2px}.table-striped>tbody>tr:nth-child(odd)>td,.table-striped>tbody>tr:nth-child(odd)>th{background-color:#f9f9f9}.table-hover>tbody>tr:hover>td,.table-hover>tbody>tr:hover>th{background-color:#f5f5f5}table col[class*="col-"]{position:static;float:none;display:table-column}table td[class*="col-"],table th[class*="col-"]{position:static;float:none;display:table-cell}.table>thead>tr>td.active,.table>tbody>tr>td.active,.table>tfoot>tr>td.active,.table>thead>tr>th.active,.table>tbody>tr>th.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>tbody>tr.active>td,.table>tfoot>tr.active>td,.table>thead>tr.active>th,.table>tbody>tr.active>th,.table>tfoot>tr.active>th{background-color:#f5f5f5}.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover,.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th{background-color:#e8e8e8}.table>thead>tr>td.success,.table>tbody>tr>td.success,.table>tfoot>tr>td.success,.table>thead>tr>th.success,.table>tbody>tr>th.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>tbody>tr.success>td,.table>tfoot>tr.success>td,.table>thead>tr.success>th,.table>tbody>tr.success>th,.table>tfoot>tr.success>th{background-color:#dff0d8}.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.success:hover>th{background-color:#d0e9c6}.table>thead>tr>td.info,.table>tbody>tr>td.info,.table>tfoot>tr>td.info,.table>thead>tr>th.info,.table>tbody>tr>th.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>tbody>tr.info>td,.table>tfoot>tr.info>td,.table>thead>tr.info>th,.table>tbody>tr.info>th,.table>tfoot>tr.info>th{background-color:#d9edf7}.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.info:hover>th{background-color:#c4e3f3}.table>thead>tr>td.warning,.table>tbody>tr>td.warning,.table>tfoot>tr>td.warning,.table>thead>tr>th.warning,.table>tbody>tr>th.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>tbody>tr.warning>td,.table>tfoot>tr.warning>td,.table>thead>tr.warning>th,.table>tbody>tr.warning>th,.table>tfoot>tr.warning>th{background-color:#fcf8e3}.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.warning:hover>th{background-color:#faf2cc}.table>thead>tr>td.danger,.table>tbody>tr>td.danger,.table>tfoot>tr>td.danger,.table>thead>tr>th.danger,.table>tbody>tr>th.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>tbody>tr.danger>td,.table>tfoot>tr.danger>td,.table>thead>tr.danger>th,.table>tbody>tr.danger>th,.table>tfoot>tr.danger>th{background-color:#f2dede}.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.danger:hover>th{background-color:#ebcccc}@media (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;overflow-x:scroll;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd;-webkit-overflow-scrolling:touch}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>thead>tr>th,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tfoot>tr>td{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>thead>tr>th:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.table-responsive>.table-bordered>thead>tr>th:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>th,.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}}fieldset{padding:0;margin:0;border:0;min-width:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;margin-bottom:5px;font-weight:bold}input[type="search"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type="radio"],input[type="checkbox"]{margin:4px 0 0;margin-top:1px \9;line-height:normal}input[type="file"]{display:block}input[type="range"]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-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);-webkit-transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#eee;opacity:1}textarea.form-control{height:auto}input[type="search"]{-webkit-appearance:none}input[type="date"]{line-height:34px}.form-group{margin-bottom:15px}.radio,.checkbox{display:block;min-height:20px;margin-top:10px;margin-bottom:10px;padding-left:20px}.radio label,.checkbox label{display:inline;font-weight:normal;cursor:pointer}.radio input[type="radio"],.radio-inline input[type="radio"],.checkbox input[type="checkbox"],.checkbox-inline input[type="checkbox"]{float:left;margin-left:-20px}.radio+.radio,.checkbox+.checkbox{margin-top:-5px}.radio-inline,.checkbox-inline{display:inline-block;padding-left:20px;margin-bottom:0;vertical-align:middle;font-weight:normal;cursor:pointer}.radio-inline+.radio-inline,.checkbox-inline+.checkbox-inline{margin-top:0;margin-left:10px}input[type="radio"][disabled],input[type="checkbox"][disabled],.radio[disabled],.radio-inline[disabled],.checkbox[disabled],.checkbox-inline[disabled],fieldset[disabled] input[type="radio"],fieldset[disabled] input[type="checkbox"],fieldset[disabled] .radio,fieldset[disabled] .radio-inline,fieldset[disabled] .checkbox,fieldset[disabled] .checkbox-inline{cursor:not-allowed}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}textarea.input-sm,select[multiple].input-sm{height:auto}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-lg{height:46px;line-height:46px}textarea.input-lg,select[multiple].input-lg{height:auto}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.has-feedback .form-control-feedback{position:absolute;top:25px;right:0;display:block;width:34px;height:34px;line-height:34px;text-align:center}.has-success .help-block,.has-success .control-label,.has-success .radio,.has-success .checkbox,.has-success .radio-inline,.has-success .checkbox-inline{color:#3c763d}.has-success .form-control{border-color:#3c763d;-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:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;border-color:#3c763d;background-color:#dff0d8}.has-success .form-control-feedback{color:#3c763d}.has-warning .help-block,.has-warning .control-label,.has-warning .radio,.has-warning .checkbox,.has-warning .radio-inline,.has-warning .checkbox-inline{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-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}.has-warning .input-group-addon{color:#8a6d3b;border-color:#8a6d3b;background-color:#fcf8e3}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .help-block,.has-error .control-label,.has-error .radio,.has-error .checkbox,.has-error .radio-inline,.has-error .checkbox-inline{color:#a94442}.has-error .form-control{border-color:#a94442;-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:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;border-color:#a94442;background-color:#f2dede}.has-error .form-control-feedback{color:#a94442}.form-control-static{margin-bottom:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .radio,.form-inline .checkbox{display:inline-block;margin-top:0;margin-bottom:0;padding-left:0;vertical-align:middle}.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:none;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .control-label,.form-horizontal .radio,.form-horizontal .checkbox,.form-horizontal .radio-inline,.form-horizontal .checkbox-inline{margin-top:0;margin-bottom:0;padding-top:7px}.form-horizontal .radio,.form-horizontal .checkbox{min-height:27px}.form-horizontal .form-group{margin-left:-15px;margin-right:-15px}.form-horizontal .form-control-static{padding-top:7px}@media (min-width:768px){.form-horizontal .control-label{text-align:right}}.form-horizontal .has-feedback .form-control-feedback{top:0;right:15px}.btn{display:inline-block;margin-bottom:0;font-weight:normal;text-align:center;vertical-align:middle;cursor:pointer;background-image:none;border:1px solid transparent;white-space:nowrap;padding:6px 12px;font-size:14px;line-height:1.42857143;border-radius:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.btn:focus,.btn:active:focus,.btn.active:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn:hover,.btn:focus{color:#333;text-decoration:none}.btn:active,.btn.active{outline:0;background-image:none;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;pointer-events:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default:hover,.btn-default:focus,.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{color:#333;background-color:#ebebeb;border-color:#adadad}.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default[disabled],fieldset[disabled] .btn-default,.btn-default.disabled:hover,.btn-default[disabled]:hover,fieldset[disabled] .btn-default:hover,.btn-default.disabled:focus,.btn-default[disabled]:focus,fieldset[disabled] .btn-default:focus,.btn-default.disabled:active,.btn-default[disabled]:active,fieldset[disabled] .btn-default:active,.btn-default.disabled.active,.btn-default[disabled].active,fieldset[disabled] .btn-default.active{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#428bca;border-color:#357ebd}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#3276b1;border-color:#285e8e}.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]:focus,fieldset[disabled] .btn-primary:focus,.btn-primary.disabled:active,.btn-primary[disabled]:active,fieldset[disabled] .btn-primary:active,.btn-primary.disabled.active,.btn-primary[disabled].active,fieldset[disabled] .btn-primary.active{background-color:#428bca;border-color:#357ebd}.btn-primary .badge{color:#428bca;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{color:#fff;background-color:#47a447;border-color:#398439}.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{background-image:none}.btn-success.disabled,.btn-success[disabled],fieldset[disabled] .btn-success,.btn-success.disabled:hover,.btn-success[disabled]:hover,fieldset[disabled] .btn-success:hover,.btn-success.disabled:focus,.btn-success[disabled]:focus,fieldset[disabled] .btn-success:focus,.btn-success.disabled:active,.btn-success[disabled]:active,fieldset[disabled] .btn-success:active,.btn-success.disabled.active,.btn-success[disabled].active,fieldset[disabled] .btn-success.active{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{color:#fff;background-color:#39b3d7;border-color:#269abc}.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info[disabled],fieldset[disabled] .btn-info,.btn-info.disabled:hover,.btn-info[disabled]:hover,fieldset[disabled] .btn-info:hover,.btn-info.disabled:focus,.btn-info[disabled]:focus,fieldset[disabled] .btn-info:focus,.btn-info.disabled:active,.btn-info[disabled]:active,fieldset[disabled] .btn-info:active,.btn-info.disabled.active,.btn-info[disabled].active,fieldset[disabled] .btn-info.active{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#ed9c28;border-color:#d58512}.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning[disabled],fieldset[disabled] .btn-warning,.btn-warning.disabled:hover,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning:hover,.btn-warning.disabled:focus,.btn-warning[disabled]:focus,fieldset[disabled] .btn-warning:focus,.btn-warning.disabled:active,.btn-warning[disabled]:active,fieldset[disabled] .btn-warning:active,.btn-warning.disabled.active,.btn-warning[disabled].active,fieldset[disabled] .btn-warning.active{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#d2322d;border-color:#ac2925}.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger[disabled],fieldset[disabled] .btn-danger,.btn-danger.disabled:hover,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger:hover,.btn-danger.disabled:focus,.btn-danger[disabled]:focus,fieldset[disabled] .btn-danger:focus,.btn-danger.disabled:active,.btn-danger[disabled]:active,fieldset[disabled] .btn-danger:active,.btn-danger.disabled.active,.btn-danger[disabled].active,fieldset[disabled] .btn-danger.active{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{color:#428bca;font-weight:normal;cursor:pointer;border-radius:0}.btn-link,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:hover,.btn-link:focus,.btn-link:active{border-color:transparent}.btn-link:hover,.btn-link:focus{color:#2a6496;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,fieldset[disabled] .btn-link:hover,.btn-link[disabled]:focus,fieldset[disabled] .btn-link:focus{color:#999;text-decoration:none}.btn-lg,.btn-group-lg>.btn{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}.btn-sm,.btn-group-sm>.btn{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-xs,.btn-group-xs>.btn{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%;padding-left:0;padding-right:0}.btn-block+.btn-block{margin-top:5px}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;transition:height .35s ease}@font-face{font-family:'Glyphicons Halflings';src:url('../fonts/glyphicons-halflings-regular.eot');src:url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/glyphicons-halflings-regular.woff') format('woff'),url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'),url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px solid;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;font-size:14px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{text-decoration:none;color:#262626;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;outline:0;background-color:#428bca}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#999}.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);cursor:not-allowed}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{left:auto;right:0}.dropdown-menu-left{left:0;right:auto}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#999}.dropdown-backdrop{position:fixed;left:0;right:0;bottom:0;top:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}@media (min-width:768px){.navbar-right .dropdown-menu{left:auto;right:0}.navbar-right .dropdown-menu-left{left:0;right:auto}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group>.btn,.btn-group-vertical>.btn{position:relative;float:left}.btn-group>.btn:hover,.btn-group-vertical>.btn:hover,.btn-group>.btn:focus,.btn-group-vertical>.btn:focus,.btn-group>.btn:active,.btn-group-vertical>.btn:active,.btn-group>.btn.active,.btn-group-vertical>.btn.active{z-index:2}.btn-group>.btn:focus,.btn-group-vertical>.btn:focus{outline:none}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-bottom-right-radius:0;border-top-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.btn-group>.btn-group{float:left}.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{border-bottom-right-radius:0;border-top-right-radius:0}.btn-group>.btn-group:last-child>.btn:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-left:8px;padding-right:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-left:12px;padding-right:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-bottom-left-radius:4px;border-top-right-radius:0;border-top-left-radius:0}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-right-radius:0;border-top-left-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{float:none;display:table-cell;width:1%}.btn-group-justified>.btn-group .btn{width:100%}[data-toggle="buttons"]>.btn>input[type="radio"],[data-toggle="buttons"]>.btn>input[type="checkbox"]{display:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*="col-"]{float:none;padding-left:0;padding-right:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn,select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn,select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn{height:auto}.input-group-addon,.input-group-btn,.input-group .form-control{display:table-cell}.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child),.input-group .form-control:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:normal;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type="radio"],.input-group-addon input[type="checkbox"]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle),.input-group-btn:last-child>.btn-group:not(:last-child)>.btn{border-bottom-right-radius:0;border-top-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:first-child>.btn-group:not(:first-child)>.btn{border-bottom-left-radius:0;border-top-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:hover,.input-group-btn>.btn:focus,.input-group-btn>.btn:active{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{margin-left:-1px}.nav{margin-bottom:0;padding-left:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#999}.nav>li.disabled>a:hover,.nav>li.disabled>a:focus{color:#999;text-decoration:none;background-color:transparent;cursor:not-allowed}.nav .open>a,.nav .open>a:hover,.nav .open>a:focus{background-color:#eee;border-color:#428bca}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{color:#555;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{text-align:center;margin-bottom:5px}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:hover,.nav-pills>li.active>a:focus{color:#fff;background-color:#428bca}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{text-align:center;margin-bottom:5px}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-right-radius:0;border-top-left-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{max-height:340px;overflow-x:visible;padding-right:15px;padding-left:15px;border-top:1px solid transparent;box-shadow:inset 0 1px 0 rgba(255,255,255,0.1);-webkit-overflow-scrolling:touch}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;box-shadow:none}.navbar-collapse.collapse{display:block !important;height:auto !important;padding-bottom:0;overflow:visible !important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse,.navbar-fixed-bottom .navbar-collapse{padding-left:0;padding-right:0}}.container>.navbar-header,.container-fluid>.navbar-header,.container>.navbar-collapse,.container-fluid>.navbar-collapse{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container>.navbar-header,.container-fluid>.navbar-header,.container>.navbar-collapse,.container-fluid>.navbar-collapse{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;padding:15px 15px;font-size:18px;line-height:20px;height:50px}.navbar-brand:hover,.navbar-brand:focus{text-decoration:none}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;margin-right:15px;padding:9px 10px;margin-top:8px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:none}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;box-shadow:none}.navbar-nav .open .dropdown-menu>li>a,.navbar-nav .open .dropdown-menu .dropdown-header{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:hover,.navbar-nav .open .dropdown-menu>li>a:focus{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}.navbar-nav.navbar-right:last-child{margin-right:-15px}}@media (min-width:768px){.navbar-left{float:left !important}.navbar-right{float:right !important}}.navbar-form{margin-left:-15px;margin-right:-15px;padding:10px 15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);margin-top:8px;margin-bottom:8px}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .radio,.navbar-form .checkbox{display:inline-block;margin-top:0;margin-bottom:0;padding-left:0;vertical-align:middle}.navbar-form .radio input[type="radio"],.navbar-form .checkbox input[type="checkbox"]{float:none;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}}@media (min-width:768px){.navbar-form{width:auto;border:0;margin-left:0;margin-right:0;padding-top:0;padding-bottom:0;-webkit-box-shadow:none;box-shadow:none}.navbar-form.navbar-right:last-child{margin-right:-15px}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-right-radius:0;border-top-left-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-left:15px;margin-right:15px}.navbar-text.navbar-right:last-child{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:hover,.navbar-default .navbar-brand:focus{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:hover,.navbar-default .navbar-nav>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:hover,.navbar-default .navbar-nav>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:hover,.navbar-default .navbar-nav>.disabled>a:focus{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:hover,.navbar-default .navbar-toggle:focus{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:hover,.navbar-default .navbar-nav>.open>a:focus{background-color:#e7e7e7;color:#555}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#999}.navbar-inverse .navbar-brand:hover,.navbar-inverse .navbar-brand:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#999}.navbar-inverse .navbar-nav>li>a{color:#999}.navbar-inverse .navbar-nav>li>a:hover,.navbar-inverse .navbar-nav>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:hover,.navbar-inverse .navbar-nav>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:hover,.navbar-inverse .navbar-nav>.disabled>a:focus{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:hover,.navbar-inverse .navbar-toggle:focus{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:hover,.navbar-inverse .navbar-nav>.open>a:focus{background-color:#080808;color:#fff}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#999}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#999}.navbar-inverse .navbar-link:hover{color:#fff}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;line-height:1.42857143;text-decoration:none;color:#428bca;background-color:#fff;border:1px solid #ddd;margin-left:-1px}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-bottom-left-radius:4px;border-top-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-bottom-right-radius:4px;border-top-right-radius:4px}.pagination>li>a:hover,.pagination>li>span:hover,.pagination>li>a:focus,.pagination>li>span:focus{color:#2a6496;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>span,.pagination>.active>a:hover,.pagination>.active>span:hover,.pagination>.active>a:focus,.pagination>.active>span:focus{z-index:2;color:#fff;background-color:#428bca;border-color:#428bca;cursor:default}.pagination>.disabled>span,.pagination>.disabled>span:hover,.pagination>.disabled>span:focus,.pagination>.disabled>a,.pagination>.disabled>a:hover,.pagination>.disabled>a:focus{color:#999;background-color:#fff;border-color:#ddd;cursor:not-allowed}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-bottom-left-radius:6px;border-top-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-bottom-right-radius:6px;border-top-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-bottom-left-radius:3px;border-top-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-bottom-right-radius:3px;border-top-right-radius:3px}.pager{padding-left:0;margin:20px 0;list-style:none;text-align:center}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>a:focus,.pager .disabled>span{color:#999;background-color:#fff;cursor:not-allowed}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:bold;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}.label[href]:hover,.label[href]:focus{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#999}.label-default[href]:hover,.label-default[href]:focus{background-color:#808080}.label-primary{background-color:#428bca}.label-primary[href]:hover,.label-primary[href]:focus{background-color:#3071a9}.label-success{background-color:#5cb85c}.label-success[href]:hover,.label-success[href]:focus{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:hover,.label-info[href]:focus{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:hover,.label-warning[href]:focus{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:hover,.label-danger[href]:focus{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:bold;color:#fff;line-height:1;vertical-align:baseline;white-space:nowrap;text-align:center;background-color:#999;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-xs .badge{top:0;padding:1px 5px}a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer}a.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#428bca;background-color:#fff}.nav-pills>li>a>.badge{margin-left:3px}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:bold}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable{padding-right:35px}.alert-dismissable .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{background-color:#dff0d8;border-color:#d6e9c6;color:#3c763d}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{background-color:#d9edf7;border-color:#bce8f1;color:#31708f}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{background-color:#fcf8e3;border-color:#faebcc;color:#8a6d3b}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{background-color:#f2dede;border-color:#ebccd1;color:#a94442}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}.list-group{margin-bottom:20px;padding-left:0}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-right-radius:4px;border-top-left-radius:4px}.list-group-item:last-child{margin-bottom:0;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{color:#555}a.list-group-item .list-group-item-heading{color:#333}a.list-group-item:hover,a.list-group-item:focus{text-decoration:none;background-color:#f5f5f5}a.list-group-item.active,a.list-group-item.active:hover,a.list-group-item.active:focus{z-index:2;color:#fff;background-color:#428bca;border-color:#428bca}a.list-group-item.active .list-group-item-heading,a.list-group-item.active:hover .list-group-item-heading,a.list-group-item.active:focus .list-group-item-heading{color:inherit}a.list-group-item.active .list-group-item-text,a.list-group-item.active:hover .list-group-item-text,a.list-group-item.active:focus .list-group-item-text{color:#e1edf7}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:hover,a.list-group-item-success:focus{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:hover,a.list-group-item-success.active:focus{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:hover,a.list-group-item-info:focus{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:hover,a.list-group-item-info.active:focus{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning{color:#8a6d3b}a.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:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:hover,a.list-group-item-warning.active:focus{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:hover,a.list-group-item-danger:focus{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:hover,a.list-group-item-danger.active:focus{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,0.05);box-shadow:0 1px 1px rgba(0,0,0,0.05)}.box-body{padding:15px}.box-header{padding:10px 15px;border-bottom:1px solid transparent;border-top-right-radius:3px;border-top-left-radius:3px}.box-header>.dropdown .dropdown-toggle{color:inherit}.box-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.box-title>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group{margin-bottom:0}.panel>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-right-radius:3px;border-top-left-radius:3px}.panel>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.box-header+.list-group .list-group-item:first-child{border-top-width:0}.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.table:first-child,.panel>.table-responsive:first-child>.table:first-child{border-top-right-radius:3px;border-top-left-radius:3px}.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table:last-child,.panel>.table-responsive:last-child>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.box-body+.table,.panel>.box-body+.table-responsive{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child th,.panel>.table>tbody:first-child>tr:first-child td{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{border:0;margin-bottom:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px;overflow:hidden}.panel-group .panel+.panel{margin-top:5px}.panel-group .box-header{border-bottom:0}.panel-group .box-header+.panel-collapse .box-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .box-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.box-header{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.box-header+.panel-collapse .box-body{border-top-color:#ddd}.panel-default>.panel-footer+.panel-collapse .box-body{border-bottom-color:#ddd}.panel-primary{border-color:#428bca}.panel-primary>.box-header{color:#fff;background-color:#428bca;border-color:#428bca}.panel-primary>.box-header+.panel-collapse .box-body{border-top-color:#428bca}.panel-primary>.panel-footer+.panel-collapse .box-body{border-bottom-color:#428bca}.panel-success{border-color:#d6e9c6}.panel-success>.box-header{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.box-header+.panel-collapse .box-body{border-top-color:#d6e9c6}.panel-success>.panel-footer+.panel-collapse .box-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.box-header{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.box-header+.panel-collapse .box-body{border-top-color:#bce8f1}.panel-info>.panel-footer+.panel-collapse .box-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.box-header{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.box-header+.panel-collapse .box-body{border-top-color:#faebcc}.panel-warning>.panel-footer+.panel-collapse .box-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.box-header{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.box-header+.panel-collapse .box-body{border-top-color:#ebccd1}.panel-danger>.panel-footer+.panel-collapse .box-body{border-bottom-color:#ebccd1}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:bold;line-height:1;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover,.close:focus{color:#000;text-decoration:none;cursor:pointer;opacity:.5;filter:alpha(opacity=50)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.modal-open{overflow:hidden}.modal{display:none;overflow:auto;overflow-y:scroll;position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transform:translate(0, -25%);-ms-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:translate(0, 0);-ms-transform:translate(0, 0);transform:translate(0, 0)}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,0.2);border-radius:6px;-webkit-box-shadow:0 3px 9px rgba(0,0,0,0.5);box-shadow:0 3px 9px rgba(0,0,0,0.5);background-clip:padding-box;outline:none}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{opacity:0;filter:alpha(opacity=0)}.modal-backdrop.in{opacity:.5;filter:alpha(opacity=50)}.modal-header{padding:15px;border-bottom:1px solid #e5e5e5;min-height:16.42857143px}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:20px}.modal-footer{margin-top:15px;padding:19px 20px 20px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-left:5px;margin-bottom:0}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,0.5);box-shadow:0 5px 15px rgba(0,0,0,0.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.clearfix:before,.clearfix:after,.container:before,.container:after,.container-fluid:before,.container-fluid:after,.row:before,.row:after,.form-horizontal .form-group:before,.form-horizontal .form-group:after,.btn-toolbar:before,.btn-toolbar:after,.btn-group-vertical>.btn-group:before,.btn-group-vertical>.btn-group:after,.nav:before,.nav:after,.navbar:before,.navbar:after,.navbar-header:before,.navbar-header:after,.navbar-collapse:before,.navbar-collapse:after,.pager:before,.pager:after,.box-body:before,.box-body:after,.modal-footer:before,.modal-footer:after{content:" ";display:table}.clearfix:after,.container:after,.container-fluid:after,.row:after,.form-horizontal .form-group:after,.btn-toolbar:after,.btn-group-vertical>.btn-group:after,.nav:after,.navbar:after,.navbar-header:after,.navbar-collapse:after,.pager:after,.box-body:after,.modal-footer:after{clear:both}.center-block{display:block;margin-left:auto;margin-right:auto}.pull-right{float:right !important}.pull-left{float:left !important}.hide{display:none !important}.show{display:block !important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none !important;visibility:hidden !important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-xs,.visible-sm,.visible-md,.visible-lg{display:none !important}@media (max-width:767px){.visible-xs{display:block !important}table.visible-xs{display:table}tr.visible-xs{display:table-row !important}th.visible-xs,td.visible-xs{display:table-cell !important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block !important}table.visible-sm{display:table}tr.visible-sm{display:table-row !important}th.visible-sm,td.visible-sm{display:table-cell !important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block !important}table.visible-md{display:table}tr.visible-md{display:table-row !important}th.visible-md,td.visible-md{display:table-cell !important}}@media (min-width:1200px){.visible-lg{display:block !important}table.visible-lg{display:table}tr.visible-lg{display:table-row !important}th.visible-lg,td.visible-lg{display:table-cell !important}}@media (max-width:767px){.hidden-xs{display:none !important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none !important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none !important}}@media (min-width:1200px){.hidden-lg{display:none !important}}.visible-print{display:none !important}@media print{.visible-print{display:block !important}table.visible-print{display:table}tr.visible-print{display:table-row !important}th.visible-print,td.visible-print{display:table-cell !important}}@media print{.hidden-print{display:none !important}}
\ No newline at end of file
+/*! normalize.css v3.0.0 | MIT License | git.io/normalize */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}h1{font-size:2em;margin:0.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace, monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}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,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:bold}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}@media print{*{text-shadow:none !important;color:#000 !important;background:transparent !important;box-shadow:none !important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100% !important}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}select{background:#fff !important}.navbar{display:none}.table td,.table th{background-color:#fff !important}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000 !important}.label{border:1px solid #000}.table{border-collapse:collapse !important}.table-bordered th,.table-bordered td{border:1px solid #ddd !important}}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:62.5%;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#428bca;text-decoration:none}a:hover,a:focus{color:#2a6496;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.img-responsive{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out;display:inline-block;max-width:100%;height:auto}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,.h1 small,.h2 small,.h3 small,.h4 small,.h5 small,.h6 small,h1 .small,h2 .small,h3 .small,h4 .small,h5 .small,h6 .small,.h1 .small,.h2 .small,.h3 .small,.h4 .small,.h5 .small,.h6 .small{font-weight:normal;line-height:1;color:#999}h1,.h1,h2,.h2,h3,.h3{margin-top:20px;margin-bottom:10px}h1 small,.h1 small,h2 small,.h2 small,h3 small,.h3 small,h1 .small,.h1 .small,h2 .small,.h2 .small,h3 .small,.h3 .small{font-size:65%}h4,.h4,h5,.h5,h6,.h6{margin-top:10px;margin-bottom:10px}h4 small,.h4 small,h5 small,.h5 small,h6 small,.h6 small,h4 .small,.h4 .small,h5 .small,.h5 .small,h6 .small,.h6 .small{font-size:75%}h1,.h1{font-size:36px}h2,.h2{font-size:30px}h3,.h3{font-size:24px}h4,.h4{font-size:18px}h5,.h5{font-size:14px}h6,.h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:200;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}small,.small{font-size:85%}cite{font-style:normal}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-muted{color:#999}.text-primary{color:#428bca}a.text-primary:hover{color:#3071a9}.text-success{color:#3c763d}a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#428bca}a.bg-primary:hover{background-color:#3071a9}.bg-success{background-color:#dff0d8}a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ul,ol{margin-top:0;margin-bottom:10px}ul ul,ol ul,ul ol,ol ol{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;list-style:none;margin-left:-5px}.list-inline>li{display:inline-block;padding-left:5px;padding-right:5px}dl{margin-top:0;margin-bottom:20px}dt,dd{line-height:1.42857143}dt{font-weight:bold}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;clear:left;text-align:right;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote p:last-child,blockquote ul:last-child,blockquote ol:last-child{margin-bottom:0}blockquote footer,blockquote small,blockquote .small{display:block;font-size:80%;line-height:1.42857143;color:#999}blockquote footer:before,blockquote small:before,blockquote .small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0;text-align:right}.blockquote-reverse footer:before,blockquote.pull-right footer:before,.blockquote-reverse small:before,blockquote.pull-right small:before,.blockquote-reverse .small:before,blockquote.pull-right .small:before{content:''}.blockquote-reverse footer:after,blockquote.pull-right footer:after,.blockquote-reverse small:after,blockquote.pull-right small:after,.blockquote-reverse .small:after,blockquote.pull-right .small:after{content:'\00A0 \2014'}blockquote:before,blockquote:after{content:""}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;white-space:nowrap;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;box-shadow:inset 0 -1px 0 rgba(0,0,0,0.25)}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;word-break:break-all;word-wrap:break-word;color:#333;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px}.row{margin-left:-15px;margin-right:-15px}.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12{position:relative;min-height:1px;padding-left:15px;padding-right:15px}.col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:0}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:0}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:0}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:0}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:0}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:0}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:0}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:0}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{max-width:100%;background-color:transparent}th{text-align:left}.table{width:100%;margin-bottom:20px}.table>thead>tr>th,.table>tbody>tr>th,.table>tfoot>tr>th,.table>thead>tr>td,.table>tbody>tr>td,.table>tfoot>tr>td{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>th,.table>caption+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>td,.table>thead:first-child>tr:first-child>td{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>thead>tr>th,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>tbody>tr>td,.table-condensed>tfoot>tr>td{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>tbody>tr>td,.table-bordered>tfoot>tr>td{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>thead>tr>td{border-bottom-width:2px}.table-striped>tbody>tr:nth-child(odd)>td,.table-striped>tbody>tr:nth-child(odd)>th{background-color:#f9f9f9}.table-hover>tbody>tr:hover>td,.table-hover>tbody>tr:hover>th{background-color:#f5f5f5}table col[class*="col-"]{position:static;float:none;display:table-column}table td[class*="col-"],table th[class*="col-"]{position:static;float:none;display:table-cell}.table>thead>tr>td.active,.table>tbody>tr>td.active,.table>tfoot>tr>td.active,.table>thead>tr>th.active,.table>tbody>tr>th.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>tbody>tr.active>td,.table>tfoot>tr.active>td,.table>thead>tr.active>th,.table>tbody>tr.active>th,.table>tfoot>tr.active>th{background-color:#f5f5f5}.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover,.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th{background-color:#e8e8e8}.table>thead>tr>td.success,.table>tbody>tr>td.success,.table>tfoot>tr>td.success,.table>thead>tr>th.success,.table>tbody>tr>th.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>tbody>tr.success>td,.table>tfoot>tr.success>td,.table>thead>tr.success>th,.table>tbody>tr.success>th,.table>tfoot>tr.success>th{background-color:#dff0d8}.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.success:hover>th{background-color:#d0e9c6}.table>thead>tr>td.info,.table>tbody>tr>td.info,.table>tfoot>tr>td.info,.table>thead>tr>th.info,.table>tbody>tr>th.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>tbody>tr.info>td,.table>tfoot>tr.info>td,.table>thead>tr.info>th,.table>tbody>tr.info>th,.table>tfoot>tr.info>th{background-color:#d9edf7}.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.info:hover>th{background-color:#c4e3f3}.table>thead>tr>td.warning,.table>tbody>tr>td.warning,.table>tfoot>tr>td.warning,.table>thead>tr>th.warning,.table>tbody>tr>th.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>tbody>tr.warning>td,.table>tfoot>tr.warning>td,.table>thead>tr.warning>th,.table>tbody>tr.warning>th,.table>tfoot>tr.warning>th{background-color:#fcf8e3}.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.warning:hover>th{background-color:#faf2cc}.table>thead>tr>td.danger,.table>tbody>tr>td.danger,.table>tfoot>tr>td.danger,.table>thead>tr>th.danger,.table>tbody>tr>th.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>tbody>tr.danger>td,.table>tfoot>tr.danger>td,.table>thead>tr.danger>th,.table>tbody>tr.danger>th,.table>tfoot>tr.danger>th{background-color:#f2dede}.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.danger:hover>th{background-color:#ebcccc}@media (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;overflow-x:scroll;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd;-webkit-overflow-scrolling:touch}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>thead>tr>th,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tfoot>tr>td{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>thead>tr>th:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.table-responsive>.table-bordered>thead>tr>th:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>th,.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}}fieldset{padding:0;margin:0;border:0;min-width:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;margin-bottom:5px;font-weight:bold}input[type="search"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type="radio"],input[type="checkbox"]{margin:4px 0 0;margin-top:1px \9;line-height:normal}input[type="file"]{display:block}input[type="range"]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-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);-webkit-transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#eee;opacity:1}textarea.form-control{height:auto}input[type="search"]{-webkit-appearance:none}input[type="date"]{line-height:34px}.form-group{margin-bottom:15px}.radio,.checkbox{display:block;min-height:20px;margin-top:10px;margin-bottom:10px;padding-left:20px}.radio label,.checkbox label{display:inline;font-weight:normal;cursor:pointer}.radio input[type="radio"],.radio-inline input[type="radio"],.checkbox input[type="checkbox"],.checkbox-inline input[type="checkbox"]{float:left;margin-left:-20px}.radio+.radio,.checkbox+.checkbox{margin-top:-5px}.radio-inline,.checkbox-inline{display:inline-block;padding-left:20px;margin-bottom:0;vertical-align:middle;font-weight:normal;cursor:pointer}.radio-inline+.radio-inline,.checkbox-inline+.checkbox-inline{margin-top:0;margin-left:10px}input[type="radio"][disabled],input[type="checkbox"][disabled],.radio[disabled],.radio-inline[disabled],.checkbox[disabled],.checkbox-inline[disabled],fieldset[disabled] input[type="radio"],fieldset[disabled] input[type="checkbox"],fieldset[disabled] .radio,fieldset[disabled] .radio-inline,fieldset[disabled] .checkbox,fieldset[disabled] .checkbox-inline{cursor:not-allowed}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}textarea.input-sm,select[multiple].input-sm{height:auto}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-lg{height:46px;line-height:46px}textarea.input-lg,select[multiple].input-lg{height:auto}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.has-feedback .form-control-feedback{position:absolute;top:25px;right:0;display:block;width:34px;height:34px;line-height:34px;text-align:center}.has-success .help-block,.has-success .control-label,.has-success .radio,.has-success .checkbox,.has-success .radio-inline,.has-success .checkbox-inline{color:#3c763d}.has-success .form-control{border-color:#3c763d;-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:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;border-color:#3c763d;background-color:#dff0d8}.has-success .form-control-feedback{color:#3c763d}.has-warning .help-block,.has-warning .control-label,.has-warning .radio,.has-warning .checkbox,.has-warning .radio-inline,.has-warning .checkbox-inline{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-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}.has-warning .input-group-addon{color:#8a6d3b;border-color:#8a6d3b;background-color:#fcf8e3}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .help-block,.has-error .control-label,.has-error .radio,.has-error .checkbox,.has-error .radio-inline,.has-error .checkbox-inline{color:#a94442}.has-error .form-control{border-color:#a94442;-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:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;border-color:#a94442;background-color:#f2dede}.has-error .form-control-feedback{color:#a94442}.form-control-static{margin-bottom:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .radio,.form-inline .checkbox{display:inline-block;margin-top:0;margin-bottom:0;padding-left:0;vertical-align:middle}.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:none;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .control-label,.form-horizontal .radio,.form-horizontal .checkbox,.form-horizontal .radio-inline,.form-horizontal .checkbox-inline{margin-top:0;margin-bottom:0;padding-top:7px}.form-horizontal .radio,.form-horizontal .checkbox{min-height:27px}.form-horizontal .form-group{margin-left:-15px;margin-right:-15px}.form-horizontal .form-control-static{padding-top:7px}@media (min-width:768px){.form-horizontal .control-label{text-align:right}}.form-horizontal .has-feedback .form-control-feedback{top:0;right:15px}.btn{display:inline-block;margin-bottom:0;font-weight:normal;text-align:center;vertical-align:middle;cursor:pointer;background-image:none;border:1px solid transparent;white-space:nowrap;padding:6px 12px;font-size:14px;line-height:1.42857143;border-radius:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.btn:focus,.btn:active:focus,.btn.active:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn:hover,.btn:focus{color:#333;text-decoration:none}.btn:active,.btn.active{outline:0;background-image:none;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;pointer-events:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default:hover,.btn-default:focus,.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{color:#333;background-color:#ebebeb;border-color:#adadad}.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default[disabled],fieldset[disabled] .btn-default,.btn-default.disabled:hover,.btn-default[disabled]:hover,fieldset[disabled] .btn-default:hover,.btn-default.disabled:focus,.btn-default[disabled]:focus,fieldset[disabled] .btn-default:focus,.btn-default.disabled:active,.btn-default[disabled]:active,fieldset[disabled] .btn-default:active,.btn-default.disabled.active,.btn-default[disabled].active,fieldset[disabled] .btn-default.active{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#428bca;border-color:#357ebd}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#3276b1;border-color:#285e8e}.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]:focus,fieldset[disabled] .btn-primary:focus,.btn-primary.disabled:active,.btn-primary[disabled]:active,fieldset[disabled] .btn-primary:active,.btn-primary.disabled.active,.btn-primary[disabled].active,fieldset[disabled] .btn-primary.active{background-color:#428bca;border-color:#357ebd}.btn-primary .badge{color:#428bca;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{color:#fff;background-color:#47a447;border-color:#398439}.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{background-image:none}.btn-success.disabled,.btn-success[disabled],fieldset[disabled] .btn-success,.btn-success.disabled:hover,.btn-success[disabled]:hover,fieldset[disabled] .btn-success:hover,.btn-success.disabled:focus,.btn-success[disabled]:focus,fieldset[disabled] .btn-success:focus,.btn-success.disabled:active,.btn-success[disabled]:active,fieldset[disabled] .btn-success:active,.btn-success.disabled.active,.btn-success[disabled].active,fieldset[disabled] .btn-success.active{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{color:#fff;background-color:#39b3d7;border-color:#269abc}.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info[disabled],fieldset[disabled] .btn-info,.btn-info.disabled:hover,.btn-info[disabled]:hover,fieldset[disabled] .btn-info:hover,.btn-info.disabled:focus,.btn-info[disabled]:focus,fieldset[disabled] .btn-info:focus,.btn-info.disabled:active,.btn-info[disabled]:active,fieldset[disabled] .btn-info:active,.btn-info.disabled.active,.btn-info[disabled].active,fieldset[disabled] .btn-info.active{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#ed9c28;border-color:#d58512}.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning[disabled],fieldset[disabled] .btn-warning,.btn-warning.disabled:hover,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning:hover,.btn-warning.disabled:focus,.btn-warning[disabled]:focus,fieldset[disabled] .btn-warning:focus,.btn-warning.disabled:active,.btn-warning[disabled]:active,fieldset[disabled] .btn-warning:active,.btn-warning.disabled.active,.btn-warning[disabled].active,fieldset[disabled] .btn-warning.active{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#d2322d;border-color:#ac2925}.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger[disabled],fieldset[disabled] .btn-danger,.btn-danger.disabled:hover,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger:hover,.btn-danger.disabled:focus,.btn-danger[disabled]:focus,fieldset[disabled] .btn-danger:focus,.btn-danger.disabled:active,.btn-danger[disabled]:active,fieldset[disabled] .btn-danger:active,.btn-danger.disabled.active,.btn-danger[disabled].active,fieldset[disabled] .btn-danger.active{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{color:#428bca;font-weight:normal;cursor:pointer;border-radius:0}.btn-link,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:hover,.btn-link:focus,.btn-link:active{border-color:transparent}.btn-link:hover,.btn-link:focus{color:#2a6496;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,fieldset[disabled] .btn-link:hover,.btn-link[disabled]:focus,fieldset[disabled] .btn-link:focus{color:#999;text-decoration:none}.btn-lg,.btn-group-lg>.btn{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}.btn-sm,.btn-group-sm>.btn{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-xs,.btn-group-xs>.btn{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%;padding-left:0;padding-right:0}.btn-block+.btn-block{margin-top:5px}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;transition:height .35s ease}@font-face{font-family:'Glyphicons Halflings';src:url('../fonts/glyphicons-halflings-regular.eot');src:url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/glyphicons-halflings-regular.woff') format('woff'),url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'),url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px solid;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;font-size:14px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{text-decoration:none;color:#262626;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;outline:0;background-color:#428bca}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#999}.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);cursor:not-allowed}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{left:auto;right:0}.dropdown-menu-left{left:0;right:auto}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#999}.dropdown-backdrop{position:fixed;left:0;right:0;bottom:0;top:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}@media (min-width:768px){.navbar-right .dropdown-menu{left:auto;right:0}.navbar-right .dropdown-menu-left{left:0;right:auto}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group>.btn,.btn-group-vertical>.btn{position:relative;float:left}.btn-group>.btn:hover,.btn-group-vertical>.btn:hover,.btn-group>.btn:focus,.btn-group-vertical>.btn:focus,.btn-group>.btn:active,.btn-group-vertical>.btn:active,.btn-group>.btn.active,.btn-group-vertical>.btn.active{z-index:2}.btn-group>.btn:focus,.btn-group-vertical>.btn:focus{outline:none}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-bottom-right-radius:0;border-top-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.btn-group>.btn-group{float:left}.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{border-bottom-right-radius:0;border-top-right-radius:0}.btn-group>.btn-group:last-child>.btn:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-left:8px;padding-right:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-left:12px;padding-right:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-bottom-left-radius:4px;border-top-right-radius:0;border-top-left-radius:0}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-right-radius:0;border-top-left-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{float:none;display:table-cell;width:1%}.btn-group-justified>.btn-group .btn{width:100%}[data-toggle="buttons"]>.btn>input[type="radio"],[data-toggle="buttons"]>.btn>input[type="checkbox"]{display:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*="col-"]{float:none;padding-left:0;padding-right:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn,select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn,select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn{height:auto}.input-group-addon,.input-group-btn,.input-group .form-control{display:table-cell}.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child),.input-group .form-control:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:normal;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type="radio"],.input-group-addon input[type="checkbox"]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle),.input-group-btn:last-child>.btn-group:not(:last-child)>.btn{border-bottom-right-radius:0;border-top-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:first-child>.btn-group:not(:first-child)>.btn{border-bottom-left-radius:0;border-top-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:hover,.input-group-btn>.btn:focus,.input-group-btn>.btn:active{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{margin-left:-1px}.nav{margin-bottom:0;padding-left:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#999}.nav>li.disabled>a:hover,.nav>li.disabled>a:focus{color:#999;text-decoration:none;background-color:transparent;cursor:not-allowed}.nav .open>a,.nav .open>a:hover,.nav .open>a:focus{background-color:#eee;border-color:#428bca}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{color:#555;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{text-align:center;margin-bottom:5px}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:hover,.nav-pills>li.active>a:focus{color:#fff;background-color:#428bca}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{text-align:center;margin-bottom:5px}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-right-radius:0;border-top-left-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{max-height:340px;overflow-x:visible;padding-right:15px;padding-left:15px;border-top:1px solid transparent;box-shadow:inset 0 1px 0 rgba(255,255,255,0.1);-webkit-overflow-scrolling:touch}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;box-shadow:none}.navbar-collapse.collapse{display:block !important;height:auto !important;padding-bottom:0;overflow:visible !important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse,.navbar-fixed-bottom .navbar-collapse{padding-left:0;padding-right:0}}.container>.navbar-header,.container-fluid>.navbar-header,.container>.navbar-collapse,.container-fluid>.navbar-collapse{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container>.navbar-header,.container-fluid>.navbar-header,.container>.navbar-collapse,.container-fluid>.navbar-collapse{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;padding:15px 15px;font-size:18px;line-height:20px;height:50px}.navbar-brand:hover,.navbar-brand:focus{text-decoration:none}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;margin-right:15px;padding:9px 10px;margin-top:8px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:none}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;box-shadow:none}.navbar-nav .open .dropdown-menu>li>a,.navbar-nav .open .dropdown-menu .dropdown-header{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:hover,.navbar-nav .open .dropdown-menu>li>a:focus{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}.navbar-nav.navbar-right:last-child{margin-right:-15px}}@media (min-width:768px){.navbar-left{float:left !important}.navbar-right{float:right !important}}.navbar-form{margin-left:-15px;margin-right:-15px;padding:10px 15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);margin-top:8px;margin-bottom:8px}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .radio,.navbar-form .checkbox{display:inline-block;margin-top:0;margin-bottom:0;padding-left:0;vertical-align:middle}.navbar-form .radio input[type="radio"],.navbar-form .checkbox input[type="checkbox"]{float:none;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}}@media (min-width:768px){.navbar-form{width:auto;border:0;margin-left:0;margin-right:0;padding-top:0;padding-bottom:0;-webkit-box-shadow:none;box-shadow:none}.navbar-form.navbar-right:last-child{margin-right:-15px}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-right-radius:0;border-top-left-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-left:15px;margin-right:15px}.navbar-text.navbar-right:last-child{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:hover,.navbar-default .navbar-brand:focus{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:hover,.navbar-default .navbar-nav>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:hover,.navbar-default .navbar-nav>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:hover,.navbar-default .navbar-nav>.disabled>a:focus{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:hover,.navbar-default .navbar-toggle:focus{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:hover,.navbar-default .navbar-nav>.open>a:focus{background-color:#e7e7e7;color:#555}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#999}.navbar-inverse .navbar-brand:hover,.navbar-inverse .navbar-brand:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#999}.navbar-inverse .navbar-nav>li>a{color:#999}.navbar-inverse .navbar-nav>li>a:hover,.navbar-inverse .navbar-nav>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:hover,.navbar-inverse .navbar-nav>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:hover,.navbar-inverse .navbar-nav>.disabled>a:focus{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:hover,.navbar-inverse .navbar-toggle:focus{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:hover,.navbar-inverse .navbar-nav>.open>a:focus{background-color:#080808;color:#fff}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#999}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#999}.navbar-inverse .navbar-link:hover{color:#fff}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;line-height:1.42857143;text-decoration:none;color:#428bca;background-color:#fff;border:1px solid #ddd;margin-left:-1px}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-bottom-left-radius:4px;border-top-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-bottom-right-radius:4px;border-top-right-radius:4px}.pagination>li>a:hover,.pagination>li>span:hover,.pagination>li>a:focus,.pagination>li>span:focus{color:#2a6496;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>span,.pagination>.active>a:hover,.pagination>.active>span:hover,.pagination>.active>a:focus,.pagination>.active>span:focus{z-index:2;color:#fff;background-color:#428bca;border-color:#428bca;cursor:default}.pagination>.disabled>span,.pagination>.disabled>span:hover,.pagination>.disabled>span:focus,.pagination>.disabled>a,.pagination>.disabled>a:hover,.pagination>.disabled>a:focus{color:#999;background-color:#fff;border-color:#ddd;cursor:not-allowed}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-bottom-left-radius:6px;border-top-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-bottom-right-radius:6px;border-top-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-bottom-left-radius:3px;border-top-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-bottom-right-radius:3px;border-top-right-radius:3px}.pager{padding-left:0;margin:20px 0;list-style:none;text-align:center}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>a:focus,.pager .disabled>span{color:#999;background-color:#fff;cursor:not-allowed}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:bold;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}.label[href]:hover,.label[href]:focus{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#999}.label-default[href]:hover,.label-default[href]:focus{background-color:#808080}.label-primary{background-color:#428bca}.label-primary[href]:hover,.label-primary[href]:focus{background-color:#3071a9}.label-success{background-color:#5cb85c}.label-success[href]:hover,.label-success[href]:focus{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:hover,.label-info[href]:focus{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:hover,.label-warning[href]:focus{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:hover,.label-danger[href]:focus{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:bold;color:#fff;line-height:1;vertical-align:baseline;white-space:nowrap;text-align:center;background-color:#999;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-xs .badge{top:0;padding:1px 5px}a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer}a.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#428bca;background-color:#fff}.nav-pills>li>a>.badge{margin-left:3px}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:bold}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable{padding-right:35px}.alert-dismissable .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{background-color:#dff0d8;border-color:#d6e9c6;color:#3c763d}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{background-color:#d9edf7;border-color:#bce8f1;color:#31708f}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{background-color:#fcf8e3;border-color:#faebcc;color:#8a6d3b}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{background-color:#f2dede;border-color:#ebccd1;color:#a94442}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}.list-group{margin-bottom:20px;padding-left:0}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-right-radius:4px;border-top-left-radius:4px}.list-group-item:last-child{margin-bottom:0;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{color:#555}a.list-group-item .list-group-item-heading{color:#333}a.list-group-item:hover,a.list-group-item:focus{text-decoration:none;background-color:#f5f5f5}a.list-group-item.active,a.list-group-item.active:hover,a.list-group-item.active:focus{z-index:2;color:#fff;background-color:#428bca;border-color:#428bca}a.list-group-item.active .list-group-item-heading,a.list-group-item.active:hover .list-group-item-heading,a.list-group-item.active:focus .list-group-item-heading{color:inherit}a.list-group-item.active .list-group-item-text,a.list-group-item.active:hover .list-group-item-text,a.list-group-item.active:focus .list-group-item-text{color:#e1edf7}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:hover,a.list-group-item-success:focus{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:hover,a.list-group-item-success.active:focus{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:hover,a.list-group-item-info:focus{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:hover,a.list-group-item-info.active:focus{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning{color:#8a6d3b}a.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:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:hover,a.list-group-item-warning.active:focus{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:hover,a.list-group-item-danger:focus{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:hover,a.list-group-item-danger.active:focus{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,0.05);box-shadow:0 1px 1px rgba(0,0,0,0.05)}.box-body{padding:15px}.box-header{padding:10px 15px;border-bottom:1px solid transparent;border-top-right-radius:3px;border-top-left-radius:3px}.box-header>.dropdown .dropdown-toggle{color:inherit}.box-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.box-title>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group{margin-bottom:0}.panel>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-right-radius:3px;border-top-left-radius:3px}.panel>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.box-header+.list-group .list-group-item:first-child{border-top-width:0}.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.table:first-child,.panel>.table-responsive:first-child>.table:first-child{border-top-right-radius:3px;border-top-left-radius:3px}.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table:last-child,.panel>.table-responsive:last-child>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.box-body+.table,.panel>.box-body+.table-responsive{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child th,.panel>.table>tbody:first-child>tr:first-child td{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{border:0;margin-bottom:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px;overflow:hidden}.panel-group .panel+.panel{margin-top:5px}.panel-group .box-header{border-bottom:0}.panel-group .box-header+.panel-collapse .box-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .box-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.box-header{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.box-header+.panel-collapse .box-body{border-top-color:#ddd}.panel-default>.panel-footer+.panel-collapse .box-body{border-bottom-color:#ddd}.panel-primary{border-color:#428bca}.panel-primary>.box-header{color:#fff;background-color:#428bca;border-color:#428bca}.panel-primary>.box-header+.panel-collapse .box-body{border-top-color:#428bca}.panel-primary>.panel-footer+.panel-collapse .box-body{border-bottom-color:#428bca}.panel-success{border-color:#d6e9c6}.panel-success>.box-header{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.box-header+.panel-collapse .box-body{border-top-color:#d6e9c6}.panel-success>.panel-footer+.panel-collapse .box-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.box-header{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.box-header+.panel-collapse .box-body{border-top-color:#bce8f1}.panel-info>.panel-footer+.panel-collapse .box-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.box-header{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.box-header+.panel-collapse .box-body{border-top-color:#faebcc}.panel-warning>.panel-footer+.panel-collapse .box-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.box-header{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.box-header+.panel-collapse .box-body{border-top-color:#ebccd1}.panel-danger>.panel-footer+.panel-collapse .box-body{border-bottom-color:#ebccd1}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:bold;line-height:1;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover,.close:focus{color:#000;text-decoration:none;cursor:pointer;opacity:.5;filter:alpha(opacity=50)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.modal-open{overflow:hidden}.modal{display:none;overflow:auto;overflow-y:scroll;position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transform:translate(0, -25%);-ms-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:translate(0, 0);-ms-transform:translate(0, 0);transform:translate(0, 0)}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,0.2);border-radius:6px;-webkit-box-shadow:0 3px 9px rgba(0,0,0,0.5);box-shadow:0 3px 9px rgba(0,0,0,0.5);background-clip:padding-box;outline:none}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{opacity:0;filter:alpha(opacity=0)}.modal-backdrop.in{opacity:.5;filter:alpha(opacity=50)}.modal-header{padding:15px;border-bottom:1px solid #e5e5e5;min-height:16.42857143px}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:20px}.modal-footer{margin-top:15px;padding:19px 20px 20px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-left:5px;margin-bottom:0}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,0.5);box-shadow:0 5px 15px rgba(0,0,0,0.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.clearfix:before,.clearfix:after,.container:before,.container:after,.container-fluid:before,.container-fluid:after,.row:before,.row:after,.form-horizontal .form-group:before,.form-horizontal .form-group:after,.btn-toolbar:before,.btn-toolbar:after,.btn-group-vertical>.btn-group:before,.btn-group-vertical>.btn-group:after,.nav:before,.nav:after,.navbar:before,.navbar:after,.navbar-header:before,.navbar-header:after,.navbar-collapse:before,.navbar-collapse:after,.pager:before,.pager:after,.box-body:before,.box-body:after,.modal-footer:before,.modal-footer:after{content:" ";display:table}.clearfix:after,.container:after,.container-fluid:after,.row:after,.form-horizontal .form-group:after,.btn-toolbar:after,.btn-group-vertical>.btn-group:after,.nav:after,.navbar:after,.navbar-header:after,.navbar-collapse:after,.pager:after,.box-body:after,.modal-footer:after{clear:both}.center-block{display:block;margin-left:auto;margin-right:auto}.pull-right{float:right !important}.pull-left{float:left !important}.hide{display:none !important}.show{display:block !important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none !important;visibility:hidden !important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-xs,.visible-sm,.visible-md,.visible-lg{display:none !important}@media (max-width:767px){.visible-xs{display:block !important}table.visible-xs{display:table}tr.visible-xs{display:table-row !important}th.visible-xs,td.visible-xs{display:table-cell !important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block !important}table.visible-sm{display:table}tr.visible-sm{display:table-row !important}th.visible-sm,td.visible-sm{display:table-cell !important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block !important}table.visible-md{display:table}tr.visible-md{display:table-row !important}th.visible-md,td.visible-md{display:table-cell !important}}@media (min-width:1200px){.visible-lg{display:block !important}table.visible-lg{display:table}tr.visible-lg{display:table-row !important}th.visible-lg,td.visible-lg{display:table-cell !important}}@media (max-width:767px){.hidden-xs{display:none !important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none !important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none !important}}@media (min-width:1200px){.hidden-lg{display:none !important}}.visible-print{display:none !important}@media print{.visible-print{display:block !important}table.visible-print{display:table}tr.visible-print{display:table-row !important}th.visible-print,td.visible-print{display:table-cell !important}}@media print{.hidden-print{display:none !important}}
diff --git a/public/assets/js/bootstrap.min.js b/public/assets/js/bootstrap.min.js
index 856dc42f..9e2add70 100755
--- a/public/assets/js/bootstrap.min.js
+++ b/public/assets/js/bootstrap.min.js
@@ -1,7 +1,11 @@
 /*!
- * Bootstrap v3.1.1 (http://getbootstrap.com)
+ * Bootstrap v3.2.0 (http://getbootstrap.com)
  * Copyright 2011-2014 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
 
-+function(a){"use strict";var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype.close=function(b){function f(){e.trigger("closed.bs.alert").remove()}var c=a(this),d=c.attr("data-target");d||(d=c.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,""));var e=a(d);b&&b.preventDefault(),e.length||(e=c.hasClass("alert")?c:c.parent()),e.trigger(b=a.Event("close.bs.alert"));if(b.isDefaultPrevented())return;e.removeClass("in"),a.support.transition&&e.hasClass("fade")?e.one(a.support.transition.end,f).emulateTransitionEnd(150):f()};var d=a.fn.alert;a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("bs.alert");e||d.data("bs.alert",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.alert.Constructor=c,a.fn.alert.noConflict=function(){return a.fn.alert=d,this},a(document).on("click.bs.alert.data-api",b,c.prototype.close)}(jQuery),+function(a){"use strict";var b=function(c,d){this.$element=a(c),this.options=a.extend({},b.DEFAULTS,d),this.isLoading=!1};b.DEFAULTS={loadingText:"loading..."},b.prototype.setState=function(b){var c="disabled",d=this.$element,e=d.is("input")?"val":"html",f=d.data();b+="Text",f.resetText||d.data("resetText",d[e]()),d[e](f[b]||this.options[b]),setTimeout(a.proxy(function(){b=="loadingText"?(this.isLoading=!0,d.addClass(c).attr(c,c)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c))},this),0)},b.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle="buttons"]');if(b.length){var c=this.$element.find("input");c.prop("type")=="radio"&&(c.prop("checked")&&this.$element.hasClass("active")?a=!1:b.find(".active").removeClass("active")),a&&c.prop("checked",!this.$element.hasClass("active")).trigger("change")}a&&this.$element.toggleClass("active")};var c=a.fn.button;a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("bs.button"),f=typeof c=="object"&&c;e||d.data("bs.button",e=new b(this,f)),c=="toggle"?e.toggle():c&&e.setState(c)})},a.fn.button.Constructor=b,a.fn.button.noConflict=function(){return a.fn.button=c,this},a(document).on("click.bs.button.data-api","[data-toggle^=button]",function(b){var c=a(b.target);c.hasClass("btn")||(c=c.closest(".btn")),c.button("toggle"),b.preventDefault()})}(jQuery),+function(a){"use strict";var b=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=this.sliding=this.interval=this.$active=this.$items=null,this.options.pause=="hover"&&this.$element.on("mouseenter",a.proxy(this.pause,this)).on("mouseleave",a.proxy(this.cycle,this))};b.DEFAULTS={interval:5e3,pause:"hover",wrap:!0},b.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},b.prototype.getActiveIndex=function(){return this.$active=this.$element.find(".item.active"),this.$items=this.$active.parent().children(),this.$items.index(this.$active)},b.prototype.to=function(b){var c=this,d=this.getActiveIndex();if(b>this.$items.length-1||b<0)return;return this.sliding?this.$element.one("slid.bs.carousel",function(){c.to(b)}):d==b?this.pause().cycle():this.slide(b>d?"next":"prev",a(this.$items[b]))},b.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},b.prototype.next=function(){if(this.sliding)return;return this.slide("next")},b.prototype.prev=function(){if(this.sliding)return;return this.slide("prev")},b.prototype.slide=function(b,c){var d=this.$element.find(".item.active"),e=c||d[b](),f=this.interval,g=b=="next"?"left":"right",h=b=="next"?"first":"last",i=this;if(!e.length){if(!this.options.wrap)return;e=this.$element.find(".item")[h]()}if(e.hasClass("active"))return this.sliding=!1;var j=a.Event("slide.bs.carousel",{relatedTarget:e[0],direction:g});this.$element.trigger(j);if(j.isDefaultPrevented())return;return this.sliding=!0,f&&this.pause(),this.$indicators.length&&(this.$indicators.find(".active").removeClass("active"),this.$element.one("slid.bs.carousel",function(){var b=a(i.$indicators.children()[i.getActiveIndex()]);b&&b.addClass("active")})),a.support.transition&&this.$element.hasClass("slide")?(e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),d.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid.bs.carousel")},0)}).emulateTransitionEnd(d.css("transition-duration").slice(0,-1)*1e3)):(d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid.bs.carousel")),f&&this.cycle(),this};var c=a.fn.carousel;a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},b.DEFAULTS,d.data(),typeof c=="object"&&c),g=typeof c=="string"?c:f.slide;e||d.data("bs.carousel",e=new b(this,f)),typeof c=="number"?e.to(c):g?e[g]():f.interval&&e.pause().cycle()})},a.fn.carousel.Constructor=b,a.fn.carousel.noConflict=function(){return a.fn.carousel=c,this},a(document).on("click.bs.carousel.data-api","[data-slide], [data-slide-to]",function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=a.extend({},e.data(),c.data()),g=c.attr("data-slide-to");g&&(f.interval=!1),e.carousel(f),(g=c.attr("data-slide-to"))&&e.data("bs.carousel").to(g),b.preventDefault()}),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var b=a(this);b.carousel(b.data())})})}(jQuery),+function(a){function e(d){a(b).remove(),a(c).each(function(){var b=f(a(this)),c={relatedTarget:this};if(!b.hasClass("open"))return;b.trigger(d=a.Event("hide.bs.dropdown",c));if(d.isDefaultPrevented())return;b.removeClass("open").trigger("hidden.bs.dropdown",c)})}function f(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}"use strict";var b=".dropdown-backdrop",c="[data-toggle=dropdown]",d=function(b){a(b).on("click.bs.dropdown",this.toggle)};d.prototype.toggle=function(b){var c=a(this);if(c.is(".disabled, :disabled"))return;var d=f(c),g=d.hasClass("open");e();if(!g){"ontouchstart"in document.documentElement&&!d.closest(".navbar-nav").length&&a('
    ').insertAfter(a(this)).on("click",e);var h={relatedTarget:this};d.trigger(b=a.Event("show.bs.dropdown",h));if(b.isDefaultPrevented())return;d.toggleClass("open").trigger("shown.bs.dropdown",h),c.focus()}return!1},d.prototype.keydown=function(b){if(!/(38|40|27)/.test(b.keyCode))return;var d=a(this);b.preventDefault(),b.stopPropagation();if(d.is(".disabled, :disabled"))return;var e=f(d),g=e.hasClass("open");if(!g||g&&b.keyCode==27)return b.which==27&&e.find(c).focus(),d.click();var h=" li:not(.divider):visible a",i=e.find("[role=menu]"+h+", [role=listbox]"+h);if(!i.length)return;var j=i.index(i.filter(":focus"));b.keyCode==38&&j>0&&j--,b.keyCode==40&&j').appendTo(document.body),this.$element.on("click.dismiss.bs.modal",a.proxy(function(a){if(a.target!==a.currentTarget)return;this.options.backdrop=="static"?this.$element[0].focus.call(this.$element[0]):this.hide.call(this)},this)),d&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in");if(!b)return;d?this.$backdrop.one(a.support.transition.end,b).emulateTransitionEnd(150):b()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(a.support.transition.end,b).emulateTransitionEnd(150):b()):b&&b()};var c=a.fn.modal;a.fn.modal=function(c,d){return this.each(function(){var e=a(this),f=e.data("bs.modal"),g=a.extend({},b.DEFAULTS,e.data(),typeof c=="object"&&c);f||e.data("bs.modal",f=new b(this,g)),typeof c=="string"?f[c](d):g.show&&f.show(d)})},a.fn.modal.Constructor=b,a.fn.modal.noConflict=function(){return a.fn.modal=c,this},a(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(b){var c=a(this),d=c.attr("href"),e=a(c.attr("data-target")||d&&d.replace(/.*(?=#[^\s]+$)/,"")),f=e.data("bs.modal")?"toggle":a.extend({remote:!/#/.test(d)&&d},e.data(),c.data());c.is("a")&&b.preventDefault(),e.modal(f,this).one("hide",function(){c.is(":visible")&&c.focus()})}),a(document).on("show.bs.modal",".modal",function(){a(document.body).addClass("modal-open")}).on("hidden.bs.modal",".modal",function(){a(document.body).removeClass("modal-open")})}(jQuery),+function(a){"use strict";var b=function(a,b){this.type=this.options=this.enabled=this.timeout=this.hoverState=this.$element=null,this.init("tooltip",a,b)};b.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'
    ',trigger:"hover focus",title:"",delay:0,html:!1,container:!1},b.prototype.init=function(b,c,d){this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d);var e=this.options.trigger.split(" ");for(var f=e.length;f--;){var g=e[f];if(g=="click")this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if(g!="manual"){var h=g=="hover"?"mouseenter":"focusin",i=g=="hover"?"mouseleave":"focusout";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},b.prototype.getDefaults=function(){return b.DEFAULTS},b.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&typeof b.delay=="number"&&(b.delay={show:b.delay,hide:b.delay}),b},b.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},b.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget)[this.type](this.getDelegateOptions()).data("bs."+this.type);clearTimeout(c.timeout),c.hoverState="in";if(!c.options.delay||!c.options.delay.show)return c.show();c.timeout=setTimeout(function(){c.hoverState=="in"&&c.show()},c.options.delay.show)},b.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget)[this.type](this.getDelegateOptions()).data("bs."+this.type);clearTimeout(c.timeout),c.hoverState="out";if(!c.options.delay||!c.options.delay.hide)return c.hide();c.timeout=setTimeout(function(){c.hoverState=="out"&&c.hide()},c.options.delay.hide)},b.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(b);if(b.isDefaultPrevented())return;var c=this,d=this.tip();this.setContent(),this.options.animation&&d.addClass("fade");var e=typeof this.options.placement=="function"?this.options.placement.call(this,d[0],this.$element[0]):this.options.placement,f=/\s?auto?\s?/i,g=f.test(e);g&&(e=e.replace(f,"")||"top"),d.detach().css({top:0,left:0,display:"block"}).addClass(e),this.options.container?d.appendTo(this.options.container):d.insertAfter(this.$element);var h=this.getPosition(),i=d[0].offsetWidth,j=d[0].offsetHeight;if(g){var k=this.$element.parent(),l=e,m=document.documentElement.scrollTop||document.body.scrollTop,n=this.options.container=="body"?window.innerWidth:k.outerWidth(),o=this.options.container=="body"?window.innerHeight:k.outerHeight(),p=this.options.container=="body"?0:k.offset().left;e=e=="bottom"&&h.top+h.height+j-m>o?"top":e=="top"&&h.top-m-j<0?"bottom":e=="right"&&h.right+i>n?"left":e=="left"&&h.left-i
    '}),b.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),b.prototype.constructor=b,b.prototype.getDefaults=function(){return b.DEFAULTS},b.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content")[this.options.html?typeof c=="string"?"html":"append":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},b.prototype.hasContent=function(){return this.getTitle()||this.getContent()},b.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||(typeof b.content=="function"?b.content.call(a[0]):b.content)},b.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")},b.prototype.tip=function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip};var c=a.fn.popover;a.fn.popover=function(c){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f=typeof c=="object"&&c;if(!e&&c=="destroy")return;e||d.data("bs.popover",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.popover.Constructor=b,a.fn.popover.noConflict=function(){return a.fn.popover=c,this}}(jQuery),+function(a){"use strict";var b=function(b){this.element=a(b)};b.prototype.show=function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.data("target");d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,""));if(b.parent("li").hasClass("active"))return;var e=c.find(".active:last a")[0],f=a.Event("show.bs.tab",{relatedTarget:e});b.trigger(f);if(f.isDefaultPrevented())return;var g=a(d);this.activate(b.parent("li"),c),this.activate(g,g.parent(),function(){b.trigger({type:"shown.bs.tab",relatedTarget:e})})},b.prototype.activate=function(b,c,d){function g(){e.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),f?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var e=c.find("> .active"),f=d&&a.support.transition&&e.hasClass("fade");f?e.one(a.support.transition.end,g).emulateTransitionEnd(150):g(),e.removeClass("in")};var c=a.fn.tab;a.fn.tab=function(c){return this.each(function(){var d=a(this),e=d.data("bs.tab");e||d.data("bs.tab",e=new b(this)),typeof c=="string"&&e[c]()})},a.fn.tab.Constructor=b,a.fn.tab.noConflict=function(){return a.fn.tab=c,this},a(document).on("click.bs.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(b){b.preventDefault(),a(this).tab("show")})}(jQuery),+function(a){"use strict";var b=function(c,d){this.$element=a(c),this.options=a.extend({},b.DEFAULTS,d),this.transitioning=null,this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.DEFAULTS={toggle:!0},b.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},b.prototype.show=function(){if(this.transitioning||this.$element.hasClass("in"))return;var b=a.Event("show.bs.collapse");this.$element.trigger(b);if(b.isDefaultPrevented())return;var c=this.$parent&&this.$parent.find("> .panel > .in");if(c&&c.length){var d=c.data("bs.collapse");if(d&&d.transitioning)return;c.collapse("hide"),d||c.data("bs.collapse",null)}var e=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[e](0),this.transitioning=1;var f=function(){this.$element.removeClass("collapsing").addClass("collapse in")[e]("auto"),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return f.call(this);var g=a.camelCase(["scroll",e].join("-"));this.$element.one(a.support.transition.end,a.proxy(f,this)).emulateTransitionEnd(350)[e](this.$element[0][g])},b.prototype.hide=function(){if(this.transitioning||!this.$element.hasClass("in"))return;var b=a.Event("hide.bs.collapse");this.$element.trigger(b);if(b.isDefaultPrevented())return;var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse").removeClass("in"),this.transitioning=1;var d=function(){this.transitioning=0,this.$element.trigger("hidden.bs.collapse").removeClass("collapsing").addClass("collapse")};if(!a.support.transition)return d.call(this);this.$element[c](0).one(a.support.transition.end,a.proxy(d,this)).emulateTransitionEnd(350)},b.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()};var c=a.fn.collapse;a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("bs.collapse"),f=a.extend({},b.DEFAULTS,d.data(),typeof c=="object"&&c);!e&&f.toggle&&c=="show"&&(c=!c),e||d.data("bs.collapse",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.collapse.Constructor=b,a.fn.collapse.noConflict=function(){return a.fn.collapse=c,this},a(document).on("click.bs.collapse.data-api","[data-toggle=collapse]",function(b){var c=a(this),d,e=c.attr("data-target")||b.preventDefault()||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""),f=a(e),g=f.data("bs.collapse"),h=g?"toggle":c.data(),i=c.attr("data-parent"),j=i&&a(i);if(!g||!g.transitioning)j&&j.find('[data-toggle=collapse][data-parent="'+i+'"]').not(c).addClass("collapsed"),c[f.hasClass("in")?"addClass":"removeClass"]("collapsed");f.collapse(h)})}(jQuery),+function(a){function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(a.style[c]!==undefined)return{end:b[c]};return!1}"use strict",a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one(a.support.transition.end,function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b()})}(jQuery)
\ No newline at end of file
+/*!
+ * Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=09c8c466aa06e64a7262)
+ * Config saved to config.json and https://gist.github.com/09c8c466aa06e64a7262
+ */
+if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(t){"use strict";function e(e){return this.each(function(){var i=t(this),s=i.data("bs.alert");s||i.data("bs.alert",s=new o(this)),"string"==typeof e&&s[e].call(i)})}var i='[data-dismiss="alert"]',o=function(e){t(e).on("click",i,this.close)};o.VERSION="3.2.0",o.prototype.close=function(e){function i(){n.detach().trigger("closed.bs.alert").remove()}var o=t(this),s=o.attr("data-target");s||(s=o.attr("href"),s=s&&s.replace(/.*(?=#[^\s]*$)/,""));var n=t(s);e&&e.preventDefault(),n.length||(n=o.hasClass("alert")?o:o.parent()),n.trigger(e=t.Event("close.bs.alert")),e.isDefaultPrevented()||(n.removeClass("in"),t.support.transition&&n.hasClass("fade")?n.one("bsTransitionEnd",i).emulateTransitionEnd(150):i())};var s=t.fn.alert;t.fn.alert=e,t.fn.alert.Constructor=o,t.fn.alert.noConflict=function(){return t.fn.alert=s,this},t(document).on("click.bs.alert.data-api",i,o.prototype.close)}(jQuery),+function(t){"use strict";function e(e){return this.each(function(){var o=t(this),s=o.data("bs.button"),n="object"==typeof e&&e;s||o.data("bs.button",s=new i(this,n)),"toggle"==e?s.toggle():e&&s.setState(e)})}var i=function(e,o){this.$element=t(e),this.options=t.extend({},i.DEFAULTS,o),this.isLoading=!1};i.VERSION="3.2.0",i.DEFAULTS={loadingText:"loading..."},i.prototype.setState=function(e){var i="disabled",o=this.$element,s=o.is("input")?"val":"html",n=o.data();e+="Text",null==n.resetText&&o.data("resetText",o[s]()),o[s](null==n[e]?this.options[e]:n[e]),setTimeout(t.proxy(function(){"loadingText"==e?(this.isLoading=!0,o.addClass(i).attr(i,i)):this.isLoading&&(this.isLoading=!1,o.removeClass(i).removeAttr(i))},this),0)},i.prototype.toggle=function(){var t=!0,e=this.$element.closest('[data-toggle="buttons"]');if(e.length){var i=this.$element.find("input");"radio"==i.prop("type")&&(i.prop("checked")&&this.$element.hasClass("active")?t=!1:e.find(".active").removeClass("active")),t&&i.prop("checked",!this.$element.hasClass("active")).trigger("change")}t&&this.$element.toggleClass("active")};var o=t.fn.button;t.fn.button=e,t.fn.button.Constructor=i,t.fn.button.noConflict=function(){return t.fn.button=o,this},t(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(i){var o=t(i.target);o.hasClass("btn")||(o=o.closest(".btn")),e.call(o,"toggle"),i.preventDefault()})}(jQuery),+function(t){"use strict";function e(e){return this.each(function(){var o=t(this),s=o.data("bs.carousel"),n=t.extend({},i.DEFAULTS,o.data(),"object"==typeof e&&e),r="string"==typeof e?e:n.slide;s||o.data("bs.carousel",s=new i(this,n)),"number"==typeof e?s.to(e):r?s[r]():n.interval&&s.pause().cycle()})}var i=function(e,i){this.$element=t(e).on("keydown.bs.carousel",t.proxy(this.keydown,this)),this.$indicators=this.$element.find(".carousel-indicators"),this.options=i,this.paused=this.sliding=this.interval=this.$active=this.$items=null,"hover"==this.options.pause&&this.$element.on("mouseenter.bs.carousel",t.proxy(this.pause,this)).on("mouseleave.bs.carousel",t.proxy(this.cycle,this))};i.VERSION="3.2.0",i.DEFAULTS={interval:5e3,pause:"hover",wrap:!0},i.prototype.keydown=function(t){switch(t.which){case 37:this.prev();break;case 39:this.next();break;default:return}t.preventDefault()},i.prototype.cycle=function(e){return e||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(t.proxy(this.next,this),this.options.interval)),this},i.prototype.getItemIndex=function(t){return this.$items=t.parent().children(".item"),this.$items.index(t||this.$active)},i.prototype.to=function(e){var i=this,o=this.getItemIndex(this.$active=this.$element.find(".item.active"));return e>this.$items.length-1||0>e?void 0:this.sliding?this.$element.one("slid.bs.carousel",function(){i.to(e)}):o==e?this.pause().cycle():this.slide(e>o?"next":"prev",t(this.$items[e]))},i.prototype.pause=function(e){return e||(this.paused=!0),this.$element.find(".next, .prev").length&&t.support.transition&&(this.$element.trigger(t.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},i.prototype.next=function(){return this.sliding?void 0:this.slide("next")},i.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},i.prototype.slide=function(e,i){var o=this.$element.find(".item.active"),s=i||o[e](),n=this.interval,r="next"==e?"left":"right",a="next"==e?"first":"last",l=this;if(!s.length){if(!this.options.wrap)return;s=this.$element.find(".item")[a]()}if(s.hasClass("active"))return this.sliding=!1;var h=s[0],p=t.Event("slide.bs.carousel",{relatedTarget:h,direction:r});if(this.$element.trigger(p),!p.isDefaultPrevented()){if(this.sliding=!0,n&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var c=t(this.$indicators.children()[this.getItemIndex(s)]);c&&c.addClass("active")}var d=t.Event("slid.bs.carousel",{relatedTarget:h,direction:r});return t.support.transition&&this.$element.hasClass("slide")?(s.addClass(e),s[0].offsetWidth,o.addClass(r),s.addClass(r),o.one("bsTransitionEnd",function(){s.removeClass([e,r].join(" ")).addClass("active"),o.removeClass(["active",r].join(" ")),l.sliding=!1,setTimeout(function(){l.$element.trigger(d)},0)}).emulateTransitionEnd(1e3*o.css("transition-duration").slice(0,-1))):(o.removeClass("active"),s.addClass("active"),this.sliding=!1,this.$element.trigger(d)),n&&this.cycle(),this}};var o=t.fn.carousel;t.fn.carousel=e,t.fn.carousel.Constructor=i,t.fn.carousel.noConflict=function(){return t.fn.carousel=o,this},t(document).on("click.bs.carousel.data-api","[data-slide], [data-slide-to]",function(i){var o,s=t(this),n=t(s.attr("data-target")||(o=s.attr("href"))&&o.replace(/.*(?=#[^\s]+$)/,""));if(n.hasClass("carousel")){var r=t.extend({},n.data(),s.data()),a=s.attr("data-slide-to");a&&(r.interval=!1),e.call(n,r),a&&n.data("bs.carousel").to(a),i.preventDefault()}}),t(window).on("load",function(){t('[data-ride="carousel"]').each(function(){var i=t(this);e.call(i,i.data())})})}(jQuery),+function(t){"use strict";function e(e){e&&3===e.which||(t(s).remove(),t(n).each(function(){var o=i(t(this)),s={relatedTarget:this};o.hasClass("open")&&(o.trigger(e=t.Event("hide.bs.dropdown",s)),e.isDefaultPrevented()||o.removeClass("open").trigger("hidden.bs.dropdown",s))}))}function i(e){var i=e.attr("data-target");i||(i=e.attr("href"),i=i&&/#[A-Za-z]/.test(i)&&i.replace(/.*(?=#[^\s]*$)/,""));var o=i&&t(i);return o&&o.length?o:e.parent()}function o(e){return this.each(function(){var i=t(this),o=i.data("bs.dropdown");o||i.data("bs.dropdown",o=new r(this)),"string"==typeof e&&o[e].call(i)})}var s=".dropdown-backdrop",n='[data-toggle="dropdown"]',r=function(e){t(e).on("click.bs.dropdown",this.toggle)};r.VERSION="3.2.0",r.prototype.toggle=function(o){var s=t(this);if(!s.is(".disabled, :disabled")){var n=i(s),r=n.hasClass("open");if(e(),!r){"ontouchstart"in document.documentElement&&!n.closest(".navbar-nav").length&&t('
    ').insertAfter(t(this)).on("click",e);var a={relatedTarget:this};if(n.trigger(o=t.Event("show.bs.dropdown",a)),o.isDefaultPrevented())return;s.trigger("focus"),n.toggleClass("open").trigger("shown.bs.dropdown",a)}return!1}},r.prototype.keydown=function(e){if(/(38|40|27)/.test(e.keyCode)){var o=t(this);if(e.preventDefault(),e.stopPropagation(),!o.is(".disabled, :disabled")){var s=i(o),r=s.hasClass("open");if(!r||r&&27==e.keyCode)return 27==e.which&&s.find(n).trigger("focus"),o.trigger("click");var a=" li:not(.divider):visible a",l=s.find('[role="menu"]'+a+', [role="listbox"]'+a);if(l.length){var h=l.index(l.filter(":focus"));38==e.keyCode&&h>0&&h--,40==e.keyCode&&h').appendTo(this.$body),this.$element.on("click.dismiss.bs.modal",t.proxy(function(t){t.target===t.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus.call(this.$element[0]):this.hide.call(this))},this)),s&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!e)return;s?this.$backdrop.one("bsTransitionEnd",e).emulateTransitionEnd(150):e()}else if(!this.isShown&&this.$backdrop){this.$backdrop.removeClass("in");var n=function(){i.removeBackdrop(),e&&e()};t.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one("bsTransitionEnd",n).emulateTransitionEnd(150):n()}else e&&e()},i.prototype.checkScrollbar=function(){document.body.clientWidth>=window.innerWidth||(this.scrollbarWidth=this.scrollbarWidth||this.measureScrollbar())},i.prototype.setScrollbar=function(){var t=parseInt(this.$body.css("padding-right")||0,10);this.scrollbarWidth&&this.$body.css("padding-right",t+this.scrollbarWidth)},i.prototype.resetScrollbar=function(){this.$body.css("padding-right","")},i.prototype.measureScrollbar=function(){var t=document.createElement("div");t.className="modal-scrollbar-measure",this.$body.append(t);var e=t.offsetWidth-t.clientWidth;return this.$body[0].removeChild(t),e};var o=t.fn.modal;t.fn.modal=e,t.fn.modal.Constructor=i,t.fn.modal.noConflict=function(){return t.fn.modal=o,this},t(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(i){var o=t(this),s=o.attr("href"),n=t(o.attr("data-target")||s&&s.replace(/.*(?=#[^\s]+$)/,"")),r=n.data("bs.modal")?"toggle":t.extend({remote:!/#/.test(s)&&s},n.data(),o.data());o.is("a")&&i.preventDefault(),n.one("show.bs.modal",function(t){t.isDefaultPrevented()||n.one("hidden.bs.modal",function(){o.is(":visible")&&o.trigger("focus")})}),e.call(n,r,this)})}(jQuery),+function(t){"use strict";function e(e){return this.each(function(){var o=t(this),s=o.data("bs.tooltip"),n="object"==typeof e&&e;(s||"destroy"!=e)&&(s||o.data("bs.tooltip",s=new i(this,n)),"string"==typeof e&&s[e]())})}var i=function(t,e){this.type=this.options=this.enabled=this.timeout=this.hoverState=this.$element=null,this.init("tooltip",t,e)};i.VERSION="3.2.0",i.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0}},i.prototype.init=function(e,i,o){this.enabled=!0,this.type=e,this.$element=t(i),this.options=this.getOptions(o),this.$viewport=this.options.viewport&&t(this.options.viewport.selector||this.options.viewport);for(var s=this.options.trigger.split(" "),n=s.length;n--;){var r=s[n];if("click"==r)this.$element.on("click."+this.type,this.options.selector,t.proxy(this.toggle,this));else if("manual"!=r){var a="hover"==r?"mouseenter":"focusin",l="hover"==r?"mouseleave":"focusout";this.$element.on(a+"."+this.type,this.options.selector,t.proxy(this.enter,this)),this.$element.on(l+"."+this.type,this.options.selector,t.proxy(this.leave,this))}}this.options.selector?this._options=t.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},i.prototype.getDefaults=function(){return i.DEFAULTS},i.prototype.getOptions=function(e){return e=t.extend({},this.getDefaults(),this.$element.data(),e),e.delay&&"number"==typeof e.delay&&(e.delay={show:e.delay,hide:e.delay}),e},i.prototype.getDelegateOptions=function(){var e={},i=this.getDefaults();return this._options&&t.each(this._options,function(t,o){i[t]!=o&&(e[t]=o)}),e},i.prototype.enter=function(e){var i=e instanceof this.constructor?e:t(e.currentTarget).data("bs."+this.type);return i||(i=new this.constructor(e.currentTarget,this.getDelegateOptions()),t(e.currentTarget).data("bs."+this.type,i)),clearTimeout(i.timeout),i.hoverState="in",i.options.delay&&i.options.delay.show?void(i.timeout=setTimeout(function(){"in"==i.hoverState&&i.show()},i.options.delay.show)):i.show()},i.prototype.leave=function(e){var i=e instanceof this.constructor?e:t(e.currentTarget).data("bs."+this.type);return i||(i=new this.constructor(e.currentTarget,this.getDelegateOptions()),t(e.currentTarget).data("bs."+this.type,i)),clearTimeout(i.timeout),i.hoverState="out",i.options.delay&&i.options.delay.hide?void(i.timeout=setTimeout(function(){"out"==i.hoverState&&i.hide()},i.options.delay.hide)):i.hide()},i.prototype.show=function(){var e=t.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(e);var i=t.contains(document.documentElement,this.$element[0]);if(e.isDefaultPrevented()||!i)return;var o=this,s=this.tip(),n=this.getUID(this.type);this.setContent(),s.attr("id",n),this.$element.attr("aria-describedby",n),this.options.animation&&s.addClass("fade");var r="function"==typeof this.options.placement?this.options.placement.call(this,s[0],this.$element[0]):this.options.placement,a=/\s?auto?\s?/i,l=a.test(r);l&&(r=r.replace(a,"")||"top"),s.detach().css({top:0,left:0,display:"block"}).addClass(r).data("bs."+this.type,this),this.options.container?s.appendTo(this.options.container):s.insertAfter(this.$element);var h=this.getPosition(),p=s[0].offsetWidth,c=s[0].offsetHeight;if(l){var d=r,f=this.$element.parent(),u=this.getPosition(f);r="bottom"==r&&h.top+h.height+c-u.scroll>u.height?"top":"top"==r&&h.top-u.scroll-c<0?"bottom":"right"==r&&h.right+p>u.width?"left":"left"==r&&h.left-pr.top+r.height&&(s.top=r.top+r.height-l)}else{var h=e.left-n,p=e.left+n+i;hr.width&&(s.left=r.left+r.width-p)}return s},i.prototype.getTitle=function(){var t,e=this.$element,i=this.options;return t=e.attr("data-original-title")||("function"==typeof i.title?i.title.call(e[0]):i.title)},i.prototype.getUID=function(t){do t+=~~(1e6*Math.random());while(document.getElementById(t));return t},i.prototype.tip=function(){return this.$tip=this.$tip||t(this.options.template)},i.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},i.prototype.validate=function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},i.prototype.enable=function(){this.enabled=!0},i.prototype.disable=function(){this.enabled=!1},i.prototype.toggleEnabled=function(){this.enabled=!this.enabled},i.prototype.toggle=function(e){var i=this;e&&(i=t(e.currentTarget).data("bs."+this.type),i||(i=new this.constructor(e.currentTarget,this.getDelegateOptions()),t(e.currentTarget).data("bs."+this.type,i))),i.tip().hasClass("in")?i.leave(i):i.enter(i)},i.prototype.destroy=function(){clearTimeout(this.timeout),this.hide().$element.off("."+this.type).removeData("bs."+this.type)};var o=t.fn.tooltip;t.fn.tooltip=e,t.fn.tooltip.Constructor=i,t.fn.tooltip.noConflict=function(){return t.fn.tooltip=o,this}}(jQuery),+function(t){"use strict";function e(e){return this.each(function(){var o=t(this),s=o.data("bs.popover"),n="object"==typeof e&&e;(s||"destroy"!=e)&&(s||o.data("bs.popover",s=new i(this,n)),"string"==typeof e&&s[e]())})}var i=function(t,e){this.init("popover",t,e)};if(!t.fn.tooltip)throw new Error("Popover requires tooltip.js");i.VERSION="3.2.0",i.DEFAULTS=t.extend({},t.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:''}),i.prototype=t.extend({},t.fn.tooltip.Constructor.prototype),i.prototype.constructor=i,i.prototype.getDefaults=function(){return i.DEFAULTS},i.prototype.setContent=function(){var t=this.tip(),e=this.getTitle(),i=this.getContent();t.find(".popover-title")[this.options.html?"html":"text"](e),t.find(".popover-content").empty()[this.options.html?"string"==typeof i?"html":"append":"text"](i),t.removeClass("fade top bottom left right in"),t.find(".popover-title").html()||t.find(".popover-title").hide()},i.prototype.hasContent=function(){return this.getTitle()||this.getContent()},i.prototype.getContent=function(){var t=this.$element,e=this.options;return t.attr("data-content")||("function"==typeof e.content?e.content.call(t[0]):e.content)},i.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")},i.prototype.tip=function(){return this.$tip||(this.$tip=t(this.options.template)),this.$tip};var o=t.fn.popover;t.fn.popover=e,t.fn.popover.Constructor=i,t.fn.popover.noConflict=function(){return t.fn.popover=o,this}}(jQuery),+function(t){"use strict";function e(e){return this.each(function(){var o=t(this),s=o.data("bs.tab");s||o.data("bs.tab",s=new i(this)),"string"==typeof e&&s[e]()})}var i=function(e){this.element=t(e)};i.VERSION="3.2.0",i.prototype.show=function(){var e=this.element,i=e.closest("ul:not(.dropdown-menu)"),o=e.data("target");if(o||(o=e.attr("href"),o=o&&o.replace(/.*(?=#[^\s]*$)/,"")),!e.parent("li").hasClass("active")){var s=i.find(".active:last a")[0],n=t.Event("show.bs.tab",{relatedTarget:s});if(e.trigger(n),!n.isDefaultPrevented()){var r=t(o);this.activate(e.closest("li"),i),this.activate(r,r.parent(),function(){e.trigger({type:"shown.bs.tab",relatedTarget:s})})}}},i.prototype.activate=function(e,i,o){function s(){n.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),e.addClass("active"),r?(e[0].offsetWidth,e.addClass("in")):e.removeClass("fade"),e.parent(".dropdown-menu")&&e.closest("li.dropdown").addClass("active"),o&&o()}var n=i.find("> .active"),r=o&&t.support.transition&&n.hasClass("fade");r?n.one("bsTransitionEnd",s).emulateTransitionEnd(150):s(),n.removeClass("in")};var o=t.fn.tab;t.fn.tab=e,t.fn.tab.Constructor=i,t.fn.tab.noConflict=function(){return t.fn.tab=o,this},t(document).on("click.bs.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(i){i.preventDefault(),e.call(t(this),"show")})}(jQuery),+function(t){"use strict";function e(e){return this.each(function(){var o=t(this),s=o.data("bs.affix"),n="object"==typeof e&&e;s||o.data("bs.affix",s=new i(this,n)),"string"==typeof e&&s[e]()})}var i=function(e,o){this.options=t.extend({},i.DEFAULTS,o),this.$target=t(this.options.target).on("scroll.bs.affix.data-api",t.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",t.proxy(this.checkPositionWithEventLoop,this)),this.$element=t(e),this.affixed=this.unpin=this.pinnedOffset=null,this.checkPosition()};i.VERSION="3.2.0",i.RESET="affix affix-top affix-bottom",i.DEFAULTS={offset:0,target:window},i.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(i.RESET).addClass("affix");var t=this.$target.scrollTop(),e=this.$element.offset();return this.pinnedOffset=e.top-t},i.prototype.checkPositionWithEventLoop=function(){setTimeout(t.proxy(this.checkPosition,this),1)},i.prototype.checkPosition=function(){if(this.$element.is(":visible")){var e=t(document).height(),o=this.$target.scrollTop(),s=this.$element.offset(),n=this.options.offset,r=n.top,a=n.bottom;"object"!=typeof n&&(a=r=n),"function"==typeof r&&(r=n.top(this.$element)),"function"==typeof a&&(a=n.bottom(this.$element));var l=null!=this.unpin&&o+this.unpin<=s.top?!1:null!=a&&s.top+this.$element.height()>=e-a?"bottom":null!=r&&r>=o?"top":!1;if(this.affixed!==l){null!=this.unpin&&this.$element.css("top","");var h="affix"+(l?"-"+l:""),p=t.Event(h+".bs.affix");this.$element.trigger(p),p.isDefaultPrevented()||(this.affixed=l,this.unpin="bottom"==l?this.getPinnedOffset():null,this.$element.removeClass(i.RESET).addClass(h).trigger(t.Event(h.replace("affix","affixed"))),"bottom"==l&&this.$element.offset({top:e-this.$element.height()-a}))}}};var o=t.fn.affix;t.fn.affix=e,t.fn.affix.Constructor=i,t.fn.affix.noConflict=function(){return t.fn.affix=o,this},t(window).on("load",function(){t('[data-spy="affix"]').each(function(){var i=t(this),o=i.data();o.offset=o.offset||{},o.offsetBottom&&(o.offset.bottom=o.offsetBottom),o.offsetTop&&(o.offset.top=o.offsetTop),e.call(i,o)})})}(jQuery),+function(t){"use strict";function e(e){return this.each(function(){var o=t(this),s=o.data("bs.collapse"),n=t.extend({},i.DEFAULTS,o.data(),"object"==typeof e&&e);!s&&n.toggle&&"show"==e&&(e=!e),s||o.data("bs.collapse",s=new i(this,n)),"string"==typeof e&&s[e]()})}var i=function(e,o){this.$element=t(e),this.options=t.extend({},i.DEFAULTS,o),this.transitioning=null,this.options.parent&&(this.$parent=t(this.options.parent)),this.options.toggle&&this.toggle()};i.VERSION="3.2.0",i.DEFAULTS={toggle:!0},i.prototype.dimension=function(){var t=this.$element.hasClass("width");return t?"width":"height"},i.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var i=t.Event("show.bs.collapse");if(this.$element.trigger(i),!i.isDefaultPrevented()){var o=this.$parent&&this.$parent.find("> .panel > .in");if(o&&o.length){var s=o.data("bs.collapse");if(s&&s.transitioning)return;e.call(o,"hide"),s||o.data("bs.collapse",null)}var n=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[n](0),this.transitioning=1;var r=function(){this.$element.removeClass("collapsing").addClass("collapse in")[n](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!t.support.transition)return r.call(this);var a=t.camelCase(["scroll",n].join("-"));this.$element.one("bsTransitionEnd",t.proxy(r,this)).emulateTransitionEnd(350)[n](this.$element[0][a])}}},i.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var e=t.Event("hide.bs.collapse");if(this.$element.trigger(e),!e.isDefaultPrevented()){var i=this.dimension();this.$element[i](this.$element[i]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse").removeClass("in"),this.transitioning=1;var o=function(){this.transitioning=0,this.$element.trigger("hidden.bs.collapse").removeClass("collapsing").addClass("collapse")};return t.support.transition?void this.$element[i](0).one("bsTransitionEnd",t.proxy(o,this)).emulateTransitionEnd(350):o.call(this)}}},i.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()};var o=t.fn.collapse;t.fn.collapse=e,t.fn.collapse.Constructor=i,t.fn.collapse.noConflict=function(){return t.fn.collapse=o,this},t(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(i){var o,s=t(this),n=s.attr("data-target")||i.preventDefault()||(o=s.attr("href"))&&o.replace(/.*(?=#[^\s]+$)/,""),r=t(n),a=r.data("bs.collapse"),l=a?"toggle":s.data(),h=s.attr("data-parent"),p=h&&t(h);a&&a.transitioning||(p&&p.find('[data-toggle="collapse"][data-parent="'+h+'"]').not(s).addClass("collapsed"),s[r.hasClass("in")?"addClass":"removeClass"]("collapsed")),e.call(r,l)})}(jQuery),+function(t){"use strict";function e(i,o){var s=t.proxy(this.process,this);this.$body=t("body"),this.$scrollElement=t(t(i).is("body")?window:i),this.options=t.extend({},e.DEFAULTS,o),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",s),this.refresh(),this.process()}function i(i){return this.each(function(){var o=t(this),s=o.data("bs.scrollspy"),n="object"==typeof i&&i;s||o.data("bs.scrollspy",s=new e(this,n)),"string"==typeof i&&s[i]()})}e.VERSION="3.2.0",e.DEFAULTS={offset:10},e.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},e.prototype.refresh=function(){var e="offset",i=0;t.isWindow(this.$scrollElement[0])||(e="position",i=this.$scrollElement.scrollTop()),this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight();var o=this;this.$body.find(this.selector).map(function(){var o=t(this),s=o.data("target")||o.attr("href"),n=/^#./.test(s)&&t(s);return n&&n.length&&n.is(":visible")&&[[n[e]().top+i,s]]||null}).sort(function(t,e){return t[0]-e[0]}).each(function(){o.offsets.push(this[0]),o.targets.push(this[1])})},e.prototype.process=function(){var t,e=this.$scrollElement.scrollTop()+this.options.offset,i=this.getScrollHeight(),o=this.options.offset+i-this.$scrollElement.height(),s=this.offsets,n=this.targets,r=this.activeTarget;if(this.scrollHeight!=i&&this.refresh(),e>=o)return r!=(t=n[n.length-1])&&this.activate(t);if(r&&e<=s[0])return r!=(t=n[0])&&this.activate(t);for(t=s.length;t--;)r!=n[t]&&e>=s[t]&&(!s[t+1]||e<=s[t+1])&&this.activate(n[t])},e.prototype.activate=function(e){this.activeTarget=e,t(this.selector).parentsUntil(this.options.target,".active").removeClass("active");var i=this.selector+'[data-target="'+e+'"],'+this.selector+'[href="'+e+'"]',o=t(i).parents("li").addClass("active");o.parent(".dropdown-menu").length&&(o=o.closest("li.dropdown").addClass("active")),o.trigger("activate.bs.scrollspy")};var o=t.fn.scrollspy;t.fn.scrollspy=i,t.fn.scrollspy.Constructor=e,t.fn.scrollspy.noConflict=function(){return t.fn.scrollspy=o,this},t(window).on("load.bs.scrollspy.data-api",function(){t('[data-spy="scroll"]').each(function(){var e=t(this);i.call(e,e.data())})})}(jQuery),+function(t){"use strict";function e(){var t=document.createElement("bootstrap"),e={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var i in e)if(void 0!==t.style[i])return{end:e[i]};return!1}t.fn.emulateTransitionEnd=function(e){var i=!1,o=this;t(this).one("bsTransitionEnd",function(){i=!0});var s=function(){i||t(o).trigger(t.support.transition.end)};return setTimeout(s,e),this},t(function(){t.support.transition=e(),t.support.transition&&(t.event.special.bsTransitionEnd={bindType:t.support.transition.end,delegateType:t.support.transition.end,handle:function(e){return t(e.target).is(this)?e.handleObj.handler.apply(this,arguments):void 0}})})}(jQuery);
\ No newline at end of file
diff --git a/public/assets/js/build-plugins/codeception.js b/public/assets/js/build-plugins/codeception.js
index def42330..01343f2b 100644
--- a/public/assets/js/build-plugins/codeception.js
+++ b/public/assets/js/build-plugins/codeception.js
@@ -1,39 +1,45 @@
 var codeceptionPlugin = ActiveBuild.UiPlugin.extend({
     id: 'build-codeception-errors',
-    css: 'col-lg-6 col-md-12 col-sm-12 col-xs-12',
+    css: 'col-lg-12 col-md-12 col-sm-12 col-xs-12',
     title: Lang.get('codeception'),
     lastData: null,
+    lastMeta: null,
     displayOnUpdate: false,
     box: true,
     rendered: false,
 
     register: function() {
         var self = this;
-        var query = ActiveBuild.registerQuery('codeception-data', -1, {key: 'codeception-data'})
+        var query_data = ActiveBuild.registerQuery('codeception-data', -1, {key: 'codeception-data'});
+        var query_meta_data = ActiveBuild.registerQuery('codeception-meta', -1, {key: 'codeception-meta'});
 
         $(window).on('codeception-data', function(data) {
-            self.onUpdate(data);
+            self.onUpdateData(data);
+        });
+
+        $(window).on('codeception-meta', function(data) {
+            self.onUpdateMeta(data);
         });
 
         $(window).on('build-updated', function() {
             if (!self.rendered) {
                 self.displayOnUpdate = true;
-                query();
+                query_data();
+                query_meta_data();
             }
         });
     },
 
     render: function() {
-
         return $('' +
             '' +
-            '' +
-            '   ' +
-            '' +
-            '
    '+Lang.get('test')+'
    ');
+            ''+Lang.get('codeception_suite')+'' +
+            ''+Lang.get('codeception_feature')+'' +
+            ''+Lang.get('codeception_time')+'' +
+            '');
     },
 
-    onUpdate: function(e) {
+    onUpdateData: function(e) {
         if (!e.queryData) {
             $('#build-codeception-errors').hide();
             return;
@@ -53,22 +59,54 @@ var codeceptionPlugin = ActiveBuild.UiPlugin.extend({
 
         for (var i in tests) {
 
-            var row = $('' +
-                ''+tests[i].suite+'' +
-                '::'+tests[i].test+'
    ' +
-                ''+(tests[i].message || '')+'' +
+            var rows = $('' +
+                ''+tests[i].suite+'' +
+                ''+tests[i].feature+'' +
+                ''+tests[i].time+''+
+                '' +
+                '' +
+                '' +
+                    ''+Lang.get('name')+': '+tests[i].name+'
    ' +
+                    ''+Lang.get('file')+': '+tests[i].file+'
    ' +
+                    (tests[i].message
+                        ? ''+Lang.get('message')+': '+tests[i].message+''
+                        : '') +
+                '' +
                 '');
 
             if (!tests[i].pass) {
-                row.addClass('danger');
+                rows.first().addClass('danger');
             } else {
-                row.addClass('success');
+                rows.first().addClass('success');
             }
 
-            tbody.append(row);
+            tbody.append(rows);
         }
 
         $('#build-codeception-errors').show();
+    },
+
+    onUpdateMeta: function(e) {
+        if (!e.queryData) {
+            return;
+        }
+
+        $('#build-codeception-errors').show();
+        $('#build-codeception-errors td').tooltip();
+
+        this.lastMeta = e.queryData;
+
+        var data = this.lastMeta[0].meta_value;
+        var tfoot = $('#codeception-data tfoot');
+        tfoot.empty();
+
+        var row = $('' +
+            '' +
+            Lang.get('codeception_synopsis', data.tests, data.timetaken, data.failures) +
+            '' +
+            '');
+
+        tfoot.append(row);
     }
 });
 

From 5688d9c4c85057307280aaff9c31f478840c856b Mon Sep 17 00:00:00 2001
From: Adirelle 
Date: Tue, 21 Apr 2015 14:16:25 +0200
Subject: [PATCH 194/329] The manual build button creates build for the
 currently watched branch.

Close #927
---
 PHPCI/View/Project/view.phtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/PHPCI/View/Project/view.phtml b/PHPCI/View/Project/view.phtml
index 2e79c017..ee21abe9 100644
--- a/PHPCI/View/Project/view.phtml
+++ b/PHPCI/View/Project/view.phtml
@@ -6,7 +6,7 @@
 
 
    
     
    
-        
+        
             
         
 
@@ -153,4 +153,4 @@ if ($page < $pages - 1) {
 
 print '
    ';
 
-?>
\ No newline at end of file
+?>

From f46a8be648b978ae0d8e727d0f97bbf2656448d0 Mon Sep 17 00:00:00 2001
From: Adirelle 
Date: Mon, 30 Mar 2015 08:56:30 +0200
Subject: [PATCH 195/329] LoggerConfig::getFor always returns the same instance
 of Logger for the same $name. This avoid issues when push handlers/processors
 to that logger. Use the Monolog\ErrorHandler to log errors and exceptions.
 PHPCI/Logging/Handler becomes PHPCI/ErrorHandler. And it only throws
 ErrorException for reported errors. No need to initialize a second
 $loggerConfig in daemonise.

Close #892
---
 PHPCI/ErrorHandler.php                   | 68 ++++++++++++++++++++++++
 PHPCI/Logging/LoggerConfig.php           | 17 +++++-
 Tests/PHPCI/Logging/LoggerConfigTest.php | 11 +++-
 bootstrap.php                            |  4 +-
 daemonise                                |  2 -
 5 files changed, 95 insertions(+), 7 deletions(-)
 create mode 100644 PHPCI/ErrorHandler.php

diff --git a/PHPCI/ErrorHandler.php b/PHPCI/ErrorHandler.php
new file mode 100644
index 00000000..d268965d
--- /dev/null
+++ b/PHPCI/ErrorHandler.php
@@ -0,0 +1,68 @@
+ 'Warning',
+        E_NOTICE            => 'Notice',
+        E_USER_ERROR        => 'User Error',
+        E_USER_WARNING      => 'User Warning',
+        E_USER_NOTICE       => 'User Notice',
+        E_STRICT            => 'Runtime Notice',
+        E_RECOVERABLE_ERROR => 'Catchable Fatal Error',
+        E_DEPRECATED        => 'Deprecated',
+        E_USER_DEPRECATED   => 'User Deprecated',
+    );
+
+    /**
+     * Registers an instance of the error handler to throw ErrorException.
+     */
+    public static function register()
+    {
+        $handler = new static();
+        set_error_handler(array($handler, 'handleError'));
+    }
+
+    /**
+     * @param integer $level
+     * @param string  $message
+     * @param string  $file
+     * @param integer $line
+     *
+     * @throws \ErrorException
+     *
+     * @internal
+     */
+    public function handleError($level, $message, $file, $line)
+    {
+        if (error_reporting() & $level === 0) {
+            return;
+        }
+
+        $exceptionLevel = isset($this->levels[$level]) ? $this->levels[$level] : $level;
+        throw new \ErrorException(
+            sprintf('%s: %s in %s line %d', $exceptionLevel, $message, $file, $line),
+            0,
+            $level,
+            $file,
+            $line
+        );
+    }
+}
diff --git a/PHPCI/Logging/LoggerConfig.php b/PHPCI/Logging/LoggerConfig.php
index 69617ee6..fd929aeb 100644
--- a/PHPCI/Logging/LoggerConfig.php
+++ b/PHPCI/Logging/LoggerConfig.php
@@ -9,6 +9,7 @@
 
 namespace PHPCI\Logging;
 
+use Monolog\ErrorHandler;
 use Monolog\Logger;
 
 /**
@@ -19,6 +20,7 @@ class LoggerConfig
 {
     const KEY_ALWAYS_LOADED = "_";
     private $config;
+    private $cache = array();
 
     /**
      * The filepath is expected to return an array which will be
@@ -56,9 +58,20 @@ class LoggerConfig
      */
     public function getFor($name)
     {
+        if (isset($this->cache[$name])) {
+            return $this->cache[$name];
+        }
+
         $handlers = $this->getHandlers(self::KEY_ALWAYS_LOADED);
-        $handlers = array_merge($handlers, $this->getHandlers($name));
-        return new Logger($name, $handlers);
+        if ($name !== self::KEY_ALWAYS_LOADED) {
+            $handlers = array_merge($handlers, $this->getHandlers($name));
+        }
+
+        $logger = new Logger($name, $handlers);
+        ErrorHandler::register($logger);
+        $this->cache[$name] = $logger;
+
+        return $logger;
     }
 
     /**
diff --git a/Tests/PHPCI/Logging/LoggerConfigTest.php b/Tests/PHPCI/Logging/LoggerConfigTest.php
index 3baf10c1..7fb95ef8 100644
--- a/Tests/PHPCI/Logging/LoggerConfigTest.php
+++ b/Tests/PHPCI/Logging/LoggerConfigTest.php
@@ -81,5 +81,14 @@ class LoggerConfigTest extends \PHPUnit_Framework_TestCase
         $this->assertSame($expectedHandler, $actualHandler);
         $this->assertNotSame($alternativeHandler, $actualHandler);
     }
-}
 
+    public function testGetFor_SameInstance()
+    {
+        $config = new LoggerConfig(array());
+
+        $logger1 = $config->getFor("something");
+        $logger2 = $config->getFor("something");
+
+        $this->assertSame($logger1, $logger2);
+    }
+}
diff --git a/bootstrap.php b/bootstrap.php
index e3f9985e..18d91d07 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -8,7 +8,6 @@
 */
 
 // Let PHP take a guess as to the default timezone, if the user hasn't set one:
-use PHPCI\Logging\Handler;
 use PHPCI\Logging\LoggerConfig;
 
 $timezone = ini_get('date.timezone');
@@ -43,9 +42,10 @@ if (!file_exists(dirname(__FILE__) . '/vendor/autoload.php') && defined('PHPCI_I
 // Load Composer autoloader:
 require_once(dirname(__FILE__) . '/vendor/autoload.php');
 
+\PHPCI\ErrorHandler::register();
+
 if (defined('PHPCI_IS_CONSOLE') && PHPCI_IS_CONSOLE) {
     $loggerConfig = LoggerConfig::newFromFile(__DIR__ . "/loggerconfig.php");
-    Handler::register($loggerConfig->getFor('_'));
 }
 
 // Load configuration if present:
diff --git a/daemonise b/daemonise
index 5117e414..c6238568 100755
--- a/daemonise
+++ b/daemonise
@@ -15,8 +15,6 @@ require('bootstrap.php');
 use PHPCI\Command\DaemoniseCommand;
 use Symfony\Component\Console\Application;
 
-$loggerConfig = \PHPCI\Logging\LoggerConfig::newFromFile(__DIR__ . "/loggerconfig.php");
-
 $application = new Application();
 $application->add(new DaemoniseCommand($loggerConfig->getFor('DaemoniseCommand')));
 $application->run();

From 3ca1667f120556633959a5472884e97b89fb4793 Mon Sep 17 00:00:00 2001
From: Adam Cooper 
Date: Thu, 23 Apr 2015 15:54:28 +0100
Subject: [PATCH 196/329] Revert CSS file change made in error as part of the
 codeception update

Close #935
---
 public/assets/css/bootstrap-theme.min.css | 4 ++--
 public/assets/css/bootstrap.min.css       | 4 ++--
 public/assets/js/bootstrap.min.js         | 8 ++------
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/public/assets/css/bootstrap-theme.min.css b/public/assets/css/bootstrap-theme.min.css
index 2ef1fd0f..9c85321d 100755
--- a/public/assets/css/bootstrap-theme.min.css
+++ b/public/assets/css/bootstrap-theme.min.css
@@ -1,7 +1,7 @@
 /*!
- * Bootstrap v3.2.0 (http://getbootstrap.com)
+ * Bootstrap v3.1.1 (http://getbootstrap.com)
  * Copyright 2011-2014 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
 
-.btn-default,.btn-primary,.btn-success,.btn-info,.btn-warning,.btn-danger{text-shadow:0 -1px 0 rgba(0,0,0,0.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 1px rgba(0,0,0,0.075)}.btn-default:active,.btn-primary:active,.btn-success:active,.btn-info:active,.btn-warning:active,.btn-danger:active,.btn-default.active,.btn-primary.active,.btn-success.active,.btn-info.active,.btn-warning.active,.btn-danger.active{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn:active,.btn.active{background-image:none}.btn-default{background-image:-webkit-linear-gradient(top, #fff 0, #e0e0e0 100%);background-image:linear-gradient(to bottom, #fff 0, #e0e0e0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background-repeat:repeat-x;border-color:#dbdbdb;text-shadow:0 1px 0 #fff;border-color:#ccc}.btn-default:hover,.btn-default:focus{background-color:#e0e0e0;background-position:0 -15px}.btn-default:active,.btn-default.active{background-color:#e0e0e0;border-color:#dbdbdb}.btn-primary{background-image:-webkit-linear-gradient(top, #428bca 0, #2d6ca2 100%);background-image:linear-gradient(to bottom, #428bca 0, #2d6ca2 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff2d6ca2', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background-repeat:repeat-x;border-color:#2b669a}.btn-primary:hover,.btn-primary:focus{background-color:#2d6ca2;background-position:0 -15px}.btn-primary:active,.btn-primary.active{background-color:#2d6ca2;border-color:#2b669a}.btn-success{background-image:-webkit-linear-gradient(top, #5cb85c 0, #419641 100%);background-image:linear-gradient(to bottom, #5cb85c 0, #419641 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff419641', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background-repeat:repeat-x;border-color:#3e8f3e}.btn-success:hover,.btn-success:focus{background-color:#419641;background-position:0 -15px}.btn-success:active,.btn-success.active{background-color:#419641;border-color:#3e8f3e}.btn-info{background-image:-webkit-linear-gradient(top, #5bc0de 0, #2aabd2 100%);background-image:linear-gradient(to bottom, #5bc0de 0, #2aabd2 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background-repeat:repeat-x;border-color:#28a4c9}.btn-info:hover,.btn-info:focus{background-color:#2aabd2;background-position:0 -15px}.btn-info:active,.btn-info.active{background-color:#2aabd2;border-color:#28a4c9}.btn-warning{background-image:-webkit-linear-gradient(top, #f0ad4e 0, #eb9316 100%);background-image:linear-gradient(to bottom, #f0ad4e 0, #eb9316 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffeb9316', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background-repeat:repeat-x;border-color:#e38d13}.btn-warning:hover,.btn-warning:focus{background-color:#eb9316;background-position:0 -15px}.btn-warning:active,.btn-warning.active{background-color:#eb9316;border-color:#e38d13}.btn-danger{background-image:-webkit-linear-gradient(top, #d9534f 0, #c12e2a 100%);background-image:linear-gradient(to bottom, #d9534f 0, #c12e2a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc12e2a', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background-repeat:repeat-x;border-color:#b92c28}.btn-danger:hover,.btn-danger:focus{background-color:#c12e2a;background-position:0 -15px}.btn-danger:active,.btn-danger.active{background-color:#c12e2a;border-color:#b92c28}.thumbnail,.img-thumbnail{-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.075);box-shadow:0 1px 2px rgba(0,0,0,0.075)}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{background-image:-webkit-linear-gradient(top, #f5f5f5 0, #e8e8e8 100%);background-image:linear-gradient(to bottom, #f5f5f5 0, #e8e8e8 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);background-color:#e8e8e8}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{background-image:-webkit-linear-gradient(top, #428bca 0, #357ebd 100%);background-image:linear-gradient(to bottom, #428bca 0, #357ebd 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);background-color:#357ebd}.navbar-default{background-image:-webkit-linear-gradient(top, #fff 0, #f8f8f8 100%);background-image:linear-gradient(to bottom, #fff 0, #f8f8f8 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 5px rgba(0,0,0,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 5px rgba(0,0,0,0.075)}.navbar-default .navbar-nav>.active>a{background-image:-webkit-linear-gradient(top, #ebebeb 0, #f3f3f3 100%);background-image:linear-gradient(to bottom, #ebebeb 0, #f3f3f3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff3f3f3', GradientType=0);-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,0.075);box-shadow:inset 0 3px 9px rgba(0,0,0,0.075)}.navbar-brand,.navbar-nav>li>a{text-shadow:0 1px 0 rgba(255,255,255,0.25)}.navbar-inverse{background-image:-webkit-linear-gradient(top, #3c3c3c 0, #222 100%);background-image:linear-gradient(to bottom, #3c3c3c 0, #222 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.navbar-inverse .navbar-nav>.active>a{background-image:-webkit-linear-gradient(top, #222 0, #282828 100%);background-image:linear-gradient(to bottom, #222 0, #282828 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff282828', GradientType=0);-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,0.25);box-shadow:inset 0 3px 9px rgba(0,0,0,0.25)}.navbar-inverse .navbar-brand,.navbar-inverse .navbar-nav>li>a{text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.navbar-static-top,.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}.alert{text-shadow:0 1px 0 rgba(255,255,255,0.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.25),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.25),0 1px 2px rgba(0,0,0,0.05)}.alert-success{background-image:-webkit-linear-gradient(top, #dff0d8 0, #c8e5bc 100%);background-image:linear-gradient(to bottom, #dff0d8 0, #c8e5bc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);border-color:#b2dba1}.alert-info{background-image:-webkit-linear-gradient(top, #d9edf7 0, #b9def0 100%);background-image:linear-gradient(to bottom, #d9edf7 0, #b9def0 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);border-color:#9acfea}.alert-warning{background-image:-webkit-linear-gradient(top, #fcf8e3 0, #f8efc0 100%);background-image:linear-gradient(to bottom, #fcf8e3 0, #f8efc0 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);border-color:#f5e79e}.alert-danger{background-image:-webkit-linear-gradient(top, #f2dede 0, #e7c3c3 100%);background-image:linear-gradient(to bottom, #f2dede 0, #e7c3c3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);border-color:#dca7a7}.progress{background-image:-webkit-linear-gradient(top, #ebebeb 0, #f5f5f5 100%);background-image:linear-gradient(to bottom, #ebebeb 0, #f5f5f5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0)}.progress-bar{background-image:-webkit-linear-gradient(top, #428bca 0, #3071a9 100%);background-image:linear-gradient(to bottom, #428bca 0, #3071a9 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0)}.progress-bar-success{background-image:-webkit-linear-gradient(top, #5cb85c 0, #449d44 100%);background-image:linear-gradient(to bottom, #5cb85c 0, #449d44 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0)}.progress-bar-info{background-image:-webkit-linear-gradient(top, #5bc0de 0, #31b0d5 100%);background-image:linear-gradient(to bottom, #5bc0de 0, #31b0d5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0)}.progress-bar-warning{background-image:-webkit-linear-gradient(top, #f0ad4e 0, #ec971f 100%);background-image:linear-gradient(to bottom, #f0ad4e 0, #ec971f 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0)}.progress-bar-danger{background-image:-webkit-linear-gradient(top, #d9534f 0, #c9302c 100%);background-image:linear-gradient(to bottom, #d9534f 0, #c9302c 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0)}.list-group{border-radius:4px;-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.075);box-shadow:0 1px 2px rgba(0,0,0,0.075)}.list-group-item.active,.list-group-item.active:hover,.list-group-item.active:focus{text-shadow:0 -1px 0 #3071a9;background-image:-webkit-linear-gradient(top, #428bca 0, #3278b3 100%);background-image:linear-gradient(to bottom, #428bca 0, #3278b3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3278b3', GradientType=0);border-color:#3278b3}.panel{-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.05);box-shadow:0 1px 2px rgba(0,0,0,0.05)}.panel-default>.box-header{background-image:-webkit-linear-gradient(top, #f5f5f5 0, #e8e8e8 100%);background-image:linear-gradient(to bottom, #f5f5f5 0, #e8e8e8 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0)}.panel-primary>.box-header{background-image:-webkit-linear-gradient(top, #428bca 0, #357ebd 100%);background-image:linear-gradient(to bottom, #428bca 0, #357ebd 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0)}.panel-success>.box-header{background-image:-webkit-linear-gradient(top, #dff0d8 0, #d0e9c6 100%);background-image:linear-gradient(to bottom, #dff0d8 0, #d0e9c6 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0)}.panel-info>.box-header{background-image:-webkit-linear-gradient(top, #d9edf7 0, #c4e3f3 100%);background-image:linear-gradient(to bottom, #d9edf7 0, #c4e3f3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0)}.panel-warning>.box-header{background-image:-webkit-linear-gradient(top, #fcf8e3 0, #faf2cc 100%);background-image:linear-gradient(to bottom, #fcf8e3 0, #faf2cc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0)}.panel-danger>.box-header{background-image:-webkit-linear-gradient(top, #f2dede 0, #ebcccc 100%);background-image:linear-gradient(to bottom, #f2dede 0, #ebcccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0)}.well{background-image:-webkit-linear-gradient(top, #e8e8e8 0, #f5f5f5 100%);background-image:linear-gradient(to bottom, #e8e8e8 0, #f5f5f5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);border-color:#dcdcdc;-webkit-box-shadow:inset 0 1px 3px rgba(0,0,0,0.05),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 3px rgba(0,0,0,0.05),0 1px 0 rgba(255,255,255,0.1)}
+.btn-default,.btn-primary,.btn-success,.btn-info,.btn-warning,.btn-danger{text-shadow:0 -1px 0 rgba(0,0,0,0.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 1px rgba(0,0,0,0.075)}.btn-default:active,.btn-primary:active,.btn-success:active,.btn-info:active,.btn-warning:active,.btn-danger:active,.btn-default.active,.btn-primary.active,.btn-success.active,.btn-info.active,.btn-warning.active,.btn-danger.active{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn:active,.btn.active{background-image:none}.btn-default{background-image:-webkit-linear-gradient(top, #fff 0, #e0e0e0 100%);background-image:linear-gradient(to bottom, #fff 0, #e0e0e0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background-repeat:repeat-x;border-color:#dbdbdb;text-shadow:0 1px 0 #fff;border-color:#ccc}.btn-default:hover,.btn-default:focus{background-color:#e0e0e0;background-position:0 -15px}.btn-default:active,.btn-default.active{background-color:#e0e0e0;border-color:#dbdbdb}.btn-primary{background-image:-webkit-linear-gradient(top, #428bca 0, #2d6ca2 100%);background-image:linear-gradient(to bottom, #428bca 0, #2d6ca2 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff2d6ca2', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background-repeat:repeat-x;border-color:#2b669a}.btn-primary:hover,.btn-primary:focus{background-color:#2d6ca2;background-position:0 -15px}.btn-primary:active,.btn-primary.active{background-color:#2d6ca2;border-color:#2b669a}.btn-success{background-image:-webkit-linear-gradient(top, #5cb85c 0, #419641 100%);background-image:linear-gradient(to bottom, #5cb85c 0, #419641 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff419641', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background-repeat:repeat-x;border-color:#3e8f3e}.btn-success:hover,.btn-success:focus{background-color:#419641;background-position:0 -15px}.btn-success:active,.btn-success.active{background-color:#419641;border-color:#3e8f3e}.btn-info{background-image:-webkit-linear-gradient(top, #5bc0de 0, #2aabd2 100%);background-image:linear-gradient(to bottom, #5bc0de 0, #2aabd2 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background-repeat:repeat-x;border-color:#28a4c9}.btn-info:hover,.btn-info:focus{background-color:#2aabd2;background-position:0 -15px}.btn-info:active,.btn-info.active{background-color:#2aabd2;border-color:#28a4c9}.btn-warning{background-image:-webkit-linear-gradient(top, #f0ad4e 0, #eb9316 100%);background-image:linear-gradient(to bottom, #f0ad4e 0, #eb9316 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffeb9316', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background-repeat:repeat-x;border-color:#e38d13}.btn-warning:hover,.btn-warning:focus{background-color:#eb9316;background-position:0 -15px}.btn-warning:active,.btn-warning.active{background-color:#eb9316;border-color:#e38d13}.btn-danger{background-image:-webkit-linear-gradient(top, #d9534f 0, #c12e2a 100%);background-image:linear-gradient(to bottom, #d9534f 0, #c12e2a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc12e2a', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background-repeat:repeat-x;border-color:#b92c28}.btn-danger:hover,.btn-danger:focus{background-color:#c12e2a;background-position:0 -15px}.btn-danger:active,.btn-danger.active{background-color:#c12e2a;border-color:#b92c28}.thumbnail,.img-thumbnail{-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.075);box-shadow:0 1px 2px rgba(0,0,0,0.075)}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{background-image:-webkit-linear-gradient(top, #f5f5f5 0, #e8e8e8 100%);background-image:linear-gradient(to bottom, #f5f5f5 0, #e8e8e8 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);background-color:#e8e8e8}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{background-image:-webkit-linear-gradient(top, #428bca 0, #357ebd 100%);background-image:linear-gradient(to bottom, #428bca 0, #357ebd 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);background-color:#357ebd}.navbar-default{background-image:-webkit-linear-gradient(top, #fff 0, #f8f8f8 100%);background-image:linear-gradient(to bottom, #fff 0, #f8f8f8 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 5px rgba(0,0,0,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 5px rgba(0,0,0,0.075)}.navbar-default .navbar-nav>.active>a{background-image:-webkit-linear-gradient(top, #ebebeb 0, #f3f3f3 100%);background-image:linear-gradient(to bottom, #ebebeb 0, #f3f3f3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff3f3f3', GradientType=0);-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,0.075);box-shadow:inset 0 3px 9px rgba(0,0,0,0.075)}.navbar-brand,.navbar-nav>li>a{text-shadow:0 1px 0 rgba(255,255,255,0.25)}.navbar-inverse{background-image:-webkit-linear-gradient(top, #3c3c3c 0, #222 100%);background-image:linear-gradient(to bottom, #3c3c3c 0, #222 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false)}.navbar-inverse .navbar-nav>.active>a{background-image:-webkit-linear-gradient(top, #222 0, #282828 100%);background-image:linear-gradient(to bottom, #222 0, #282828 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff282828', GradientType=0);-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,0.25);box-shadow:inset 0 3px 9px rgba(0,0,0,0.25)}.navbar-inverse .navbar-brand,.navbar-inverse .navbar-nav>li>a{text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.navbar-static-top,.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}.alert{text-shadow:0 1px 0 rgba(255,255,255,0.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.25),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.25),0 1px 2px rgba(0,0,0,0.05)}.alert-success{background-image:-webkit-linear-gradient(top, #dff0d8 0, #c8e5bc 100%);background-image:linear-gradient(to bottom, #dff0d8 0, #c8e5bc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);border-color:#b2dba1}.alert-info{background-image:-webkit-linear-gradient(top, #d9edf7 0, #b9def0 100%);background-image:linear-gradient(to bottom, #d9edf7 0, #b9def0 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);border-color:#9acfea}.alert-warning{background-image:-webkit-linear-gradient(top, #fcf8e3 0, #f8efc0 100%);background-image:linear-gradient(to bottom, #fcf8e3 0, #f8efc0 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);border-color:#f5e79e}.alert-danger{background-image:-webkit-linear-gradient(top, #f2dede 0, #e7c3c3 100%);background-image:linear-gradient(to bottom, #f2dede 0, #e7c3c3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);border-color:#dca7a7}.progress{background-image:-webkit-linear-gradient(top, #ebebeb 0, #f5f5f5 100%);background-image:linear-gradient(to bottom, #ebebeb 0, #f5f5f5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0)}.progress-bar{background-image:-webkit-linear-gradient(top, #428bca 0, #3071a9 100%);background-image:linear-gradient(to bottom, #428bca 0, #3071a9 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0)}.progress-bar-success{background-image:-webkit-linear-gradient(top, #5cb85c 0, #449d44 100%);background-image:linear-gradient(to bottom, #5cb85c 0, #449d44 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0)}.progress-bar-info{background-image:-webkit-linear-gradient(top, #5bc0de 0, #31b0d5 100%);background-image:linear-gradient(to bottom, #5bc0de 0, #31b0d5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0)}.progress-bar-warning{background-image:-webkit-linear-gradient(top, #f0ad4e 0, #ec971f 100%);background-image:linear-gradient(to bottom, #f0ad4e 0, #ec971f 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0)}.progress-bar-danger{background-image:-webkit-linear-gradient(top, #d9534f 0, #c9302c 100%);background-image:linear-gradient(to bottom, #d9534f 0, #c9302c 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0)}.list-group{border-radius:4px;-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.075);box-shadow:0 1px 2px rgba(0,0,0,0.075)}.list-group-item.active,.list-group-item.active:hover,.list-group-item.active:focus{text-shadow:0 -1px 0 #3071a9;background-image:-webkit-linear-gradient(top, #428bca 0, #3278b3 100%);background-image:linear-gradient(to bottom, #428bca 0, #3278b3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3278b3', GradientType=0);border-color:#3278b3}.panel{-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.05);box-shadow:0 1px 2px rgba(0,0,0,0.05)}.panel-default>.box-header{background-image:-webkit-linear-gradient(top, #f5f5f5 0, #e8e8e8 100%);background-image:linear-gradient(to bottom, #f5f5f5 0, #e8e8e8 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0)}.panel-primary>.box-header{background-image:-webkit-linear-gradient(top, #428bca 0, #357ebd 100%);background-image:linear-gradient(to bottom, #428bca 0, #357ebd 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0)}.panel-success>.box-header{background-image:-webkit-linear-gradient(top, #dff0d8 0, #d0e9c6 100%);background-image:linear-gradient(to bottom, #dff0d8 0, #d0e9c6 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0)}.panel-info>.box-header{background-image:-webkit-linear-gradient(top, #d9edf7 0, #c4e3f3 100%);background-image:linear-gradient(to bottom, #d9edf7 0, #c4e3f3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0)}.panel-warning>.box-header{background-image:-webkit-linear-gradient(top, #fcf8e3 0, #faf2cc 100%);background-image:linear-gradient(to bottom, #fcf8e3 0, #faf2cc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0)}.panel-danger>.box-header{background-image:-webkit-linear-gradient(top, #f2dede 0, #ebcccc 100%);background-image:linear-gradient(to bottom, #f2dede 0, #ebcccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0)}.well{background-image:-webkit-linear-gradient(top, #e8e8e8 0, #f5f5f5 100%);background-image:linear-gradient(to bottom, #e8e8e8 0, #f5f5f5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);border-color:#dcdcdc;-webkit-box-shadow:inset 0 1px 3px rgba(0,0,0,0.05),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 3px rgba(0,0,0,0.05),0 1px 0 rgba(255,255,255,0.1)}
\ No newline at end of file
diff --git a/public/assets/css/bootstrap.min.css b/public/assets/css/bootstrap.min.css
index 7e029af9..7af7ea7c 100755
--- a/public/assets/css/bootstrap.min.css
+++ b/public/assets/css/bootstrap.min.css
@@ -1,7 +1,7 @@
 /*!
- * Bootstrap v3.2.0 (http://getbootstrap.com)
+ * Bootstrap v3.1.1 (http://getbootstrap.com)
  * Copyright 2011-2014 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
 
-/*! normalize.css v3.0.0 | MIT License | git.io/normalize */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}h1{font-size:2em;margin:0.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace, monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}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,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:bold}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}@media print{*{text-shadow:none !important;color:#000 !important;background:transparent !important;box-shadow:none !important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100% !important}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}select{background:#fff !important}.navbar{display:none}.table td,.table th{background-color:#fff !important}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000 !important}.label{border:1px solid #000}.table{border-collapse:collapse !important}.table-bordered th,.table-bordered td{border:1px solid #ddd !important}}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:62.5%;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#428bca;text-decoration:none}a:hover,a:focus{color:#2a6496;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.img-responsive{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out;display:inline-block;max-width:100%;height:auto}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,.h1 small,.h2 small,.h3 small,.h4 small,.h5 small,.h6 small,h1 .small,h2 .small,h3 .small,h4 .small,h5 .small,h6 .small,.h1 .small,.h2 .small,.h3 .small,.h4 .small,.h5 .small,.h6 .small{font-weight:normal;line-height:1;color:#999}h1,.h1,h2,.h2,h3,.h3{margin-top:20px;margin-bottom:10px}h1 small,.h1 small,h2 small,.h2 small,h3 small,.h3 small,h1 .small,.h1 .small,h2 .small,.h2 .small,h3 .small,.h3 .small{font-size:65%}h4,.h4,h5,.h5,h6,.h6{margin-top:10px;margin-bottom:10px}h4 small,.h4 small,h5 small,.h5 small,h6 small,.h6 small,h4 .small,.h4 .small,h5 .small,.h5 .small,h6 .small,.h6 .small{font-size:75%}h1,.h1{font-size:36px}h2,.h2{font-size:30px}h3,.h3{font-size:24px}h4,.h4{font-size:18px}h5,.h5{font-size:14px}h6,.h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:200;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}small,.small{font-size:85%}cite{font-style:normal}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-muted{color:#999}.text-primary{color:#428bca}a.text-primary:hover{color:#3071a9}.text-success{color:#3c763d}a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#428bca}a.bg-primary:hover{background-color:#3071a9}.bg-success{background-color:#dff0d8}a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ul,ol{margin-top:0;margin-bottom:10px}ul ul,ol ul,ul ol,ol ol{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;list-style:none;margin-left:-5px}.list-inline>li{display:inline-block;padding-left:5px;padding-right:5px}dl{margin-top:0;margin-bottom:20px}dt,dd{line-height:1.42857143}dt{font-weight:bold}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;clear:left;text-align:right;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote p:last-child,blockquote ul:last-child,blockquote ol:last-child{margin-bottom:0}blockquote footer,blockquote small,blockquote .small{display:block;font-size:80%;line-height:1.42857143;color:#999}blockquote footer:before,blockquote small:before,blockquote .small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0;text-align:right}.blockquote-reverse footer:before,blockquote.pull-right footer:before,.blockquote-reverse small:before,blockquote.pull-right small:before,.blockquote-reverse .small:before,blockquote.pull-right .small:before{content:''}.blockquote-reverse footer:after,blockquote.pull-right footer:after,.blockquote-reverse small:after,blockquote.pull-right small:after,.blockquote-reverse .small:after,blockquote.pull-right .small:after{content:'\00A0 \2014'}blockquote:before,blockquote:after{content:""}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;white-space:nowrap;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;box-shadow:inset 0 -1px 0 rgba(0,0,0,0.25)}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;word-break:break-all;word-wrap:break-word;color:#333;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px}.row{margin-left:-15px;margin-right:-15px}.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12{position:relative;min-height:1px;padding-left:15px;padding-right:15px}.col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:0}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:0}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:0}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:0}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:0}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:0}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:0}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:0}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{max-width:100%;background-color:transparent}th{text-align:left}.table{width:100%;margin-bottom:20px}.table>thead>tr>th,.table>tbody>tr>th,.table>tfoot>tr>th,.table>thead>tr>td,.table>tbody>tr>td,.table>tfoot>tr>td{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>th,.table>caption+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>td,.table>thead:first-child>tr:first-child>td{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>thead>tr>th,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>tbody>tr>td,.table-condensed>tfoot>tr>td{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>tbody>tr>td,.table-bordered>tfoot>tr>td{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>thead>tr>td{border-bottom-width:2px}.table-striped>tbody>tr:nth-child(odd)>td,.table-striped>tbody>tr:nth-child(odd)>th{background-color:#f9f9f9}.table-hover>tbody>tr:hover>td,.table-hover>tbody>tr:hover>th{background-color:#f5f5f5}table col[class*="col-"]{position:static;float:none;display:table-column}table td[class*="col-"],table th[class*="col-"]{position:static;float:none;display:table-cell}.table>thead>tr>td.active,.table>tbody>tr>td.active,.table>tfoot>tr>td.active,.table>thead>tr>th.active,.table>tbody>tr>th.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>tbody>tr.active>td,.table>tfoot>tr.active>td,.table>thead>tr.active>th,.table>tbody>tr.active>th,.table>tfoot>tr.active>th{background-color:#f5f5f5}.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover,.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th{background-color:#e8e8e8}.table>thead>tr>td.success,.table>tbody>tr>td.success,.table>tfoot>tr>td.success,.table>thead>tr>th.success,.table>tbody>tr>th.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>tbody>tr.success>td,.table>tfoot>tr.success>td,.table>thead>tr.success>th,.table>tbody>tr.success>th,.table>tfoot>tr.success>th{background-color:#dff0d8}.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.success:hover>th{background-color:#d0e9c6}.table>thead>tr>td.info,.table>tbody>tr>td.info,.table>tfoot>tr>td.info,.table>thead>tr>th.info,.table>tbody>tr>th.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>tbody>tr.info>td,.table>tfoot>tr.info>td,.table>thead>tr.info>th,.table>tbody>tr.info>th,.table>tfoot>tr.info>th{background-color:#d9edf7}.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.info:hover>th{background-color:#c4e3f3}.table>thead>tr>td.warning,.table>tbody>tr>td.warning,.table>tfoot>tr>td.warning,.table>thead>tr>th.warning,.table>tbody>tr>th.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>tbody>tr.warning>td,.table>tfoot>tr.warning>td,.table>thead>tr.warning>th,.table>tbody>tr.warning>th,.table>tfoot>tr.warning>th{background-color:#fcf8e3}.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.warning:hover>th{background-color:#faf2cc}.table>thead>tr>td.danger,.table>tbody>tr>td.danger,.table>tfoot>tr>td.danger,.table>thead>tr>th.danger,.table>tbody>tr>th.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>tbody>tr.danger>td,.table>tfoot>tr.danger>td,.table>thead>tr.danger>th,.table>tbody>tr.danger>th,.table>tfoot>tr.danger>th{background-color:#f2dede}.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.danger:hover>th{background-color:#ebcccc}@media (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;overflow-x:scroll;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd;-webkit-overflow-scrolling:touch}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>thead>tr>th,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tfoot>tr>td{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>thead>tr>th:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.table-responsive>.table-bordered>thead>tr>th:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>th,.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}}fieldset{padding:0;margin:0;border:0;min-width:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;margin-bottom:5px;font-weight:bold}input[type="search"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type="radio"],input[type="checkbox"]{margin:4px 0 0;margin-top:1px \9;line-height:normal}input[type="file"]{display:block}input[type="range"]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-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);-webkit-transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#eee;opacity:1}textarea.form-control{height:auto}input[type="search"]{-webkit-appearance:none}input[type="date"]{line-height:34px}.form-group{margin-bottom:15px}.radio,.checkbox{display:block;min-height:20px;margin-top:10px;margin-bottom:10px;padding-left:20px}.radio label,.checkbox label{display:inline;font-weight:normal;cursor:pointer}.radio input[type="radio"],.radio-inline input[type="radio"],.checkbox input[type="checkbox"],.checkbox-inline input[type="checkbox"]{float:left;margin-left:-20px}.radio+.radio,.checkbox+.checkbox{margin-top:-5px}.radio-inline,.checkbox-inline{display:inline-block;padding-left:20px;margin-bottom:0;vertical-align:middle;font-weight:normal;cursor:pointer}.radio-inline+.radio-inline,.checkbox-inline+.checkbox-inline{margin-top:0;margin-left:10px}input[type="radio"][disabled],input[type="checkbox"][disabled],.radio[disabled],.radio-inline[disabled],.checkbox[disabled],.checkbox-inline[disabled],fieldset[disabled] input[type="radio"],fieldset[disabled] input[type="checkbox"],fieldset[disabled] .radio,fieldset[disabled] .radio-inline,fieldset[disabled] .checkbox,fieldset[disabled] .checkbox-inline{cursor:not-allowed}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}textarea.input-sm,select[multiple].input-sm{height:auto}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-lg{height:46px;line-height:46px}textarea.input-lg,select[multiple].input-lg{height:auto}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.has-feedback .form-control-feedback{position:absolute;top:25px;right:0;display:block;width:34px;height:34px;line-height:34px;text-align:center}.has-success .help-block,.has-success .control-label,.has-success .radio,.has-success .checkbox,.has-success .radio-inline,.has-success .checkbox-inline{color:#3c763d}.has-success .form-control{border-color:#3c763d;-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:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;border-color:#3c763d;background-color:#dff0d8}.has-success .form-control-feedback{color:#3c763d}.has-warning .help-block,.has-warning .control-label,.has-warning .radio,.has-warning .checkbox,.has-warning .radio-inline,.has-warning .checkbox-inline{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-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}.has-warning .input-group-addon{color:#8a6d3b;border-color:#8a6d3b;background-color:#fcf8e3}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .help-block,.has-error .control-label,.has-error .radio,.has-error .checkbox,.has-error .radio-inline,.has-error .checkbox-inline{color:#a94442}.has-error .form-control{border-color:#a94442;-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:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;border-color:#a94442;background-color:#f2dede}.has-error .form-control-feedback{color:#a94442}.form-control-static{margin-bottom:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .radio,.form-inline .checkbox{display:inline-block;margin-top:0;margin-bottom:0;padding-left:0;vertical-align:middle}.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:none;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .control-label,.form-horizontal .radio,.form-horizontal .checkbox,.form-horizontal .radio-inline,.form-horizontal .checkbox-inline{margin-top:0;margin-bottom:0;padding-top:7px}.form-horizontal .radio,.form-horizontal .checkbox{min-height:27px}.form-horizontal .form-group{margin-left:-15px;margin-right:-15px}.form-horizontal .form-control-static{padding-top:7px}@media (min-width:768px){.form-horizontal .control-label{text-align:right}}.form-horizontal .has-feedback .form-control-feedback{top:0;right:15px}.btn{display:inline-block;margin-bottom:0;font-weight:normal;text-align:center;vertical-align:middle;cursor:pointer;background-image:none;border:1px solid transparent;white-space:nowrap;padding:6px 12px;font-size:14px;line-height:1.42857143;border-radius:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.btn:focus,.btn:active:focus,.btn.active:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn:hover,.btn:focus{color:#333;text-decoration:none}.btn:active,.btn.active{outline:0;background-image:none;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;pointer-events:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default:hover,.btn-default:focus,.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{color:#333;background-color:#ebebeb;border-color:#adadad}.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default[disabled],fieldset[disabled] .btn-default,.btn-default.disabled:hover,.btn-default[disabled]:hover,fieldset[disabled] .btn-default:hover,.btn-default.disabled:focus,.btn-default[disabled]:focus,fieldset[disabled] .btn-default:focus,.btn-default.disabled:active,.btn-default[disabled]:active,fieldset[disabled] .btn-default:active,.btn-default.disabled.active,.btn-default[disabled].active,fieldset[disabled] .btn-default.active{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#428bca;border-color:#357ebd}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#3276b1;border-color:#285e8e}.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]:focus,fieldset[disabled] .btn-primary:focus,.btn-primary.disabled:active,.btn-primary[disabled]:active,fieldset[disabled] .btn-primary:active,.btn-primary.disabled.active,.btn-primary[disabled].active,fieldset[disabled] .btn-primary.active{background-color:#428bca;border-color:#357ebd}.btn-primary .badge{color:#428bca;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{color:#fff;background-color:#47a447;border-color:#398439}.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{background-image:none}.btn-success.disabled,.btn-success[disabled],fieldset[disabled] .btn-success,.btn-success.disabled:hover,.btn-success[disabled]:hover,fieldset[disabled] .btn-success:hover,.btn-success.disabled:focus,.btn-success[disabled]:focus,fieldset[disabled] .btn-success:focus,.btn-success.disabled:active,.btn-success[disabled]:active,fieldset[disabled] .btn-success:active,.btn-success.disabled.active,.btn-success[disabled].active,fieldset[disabled] .btn-success.active{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{color:#fff;background-color:#39b3d7;border-color:#269abc}.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info[disabled],fieldset[disabled] .btn-info,.btn-info.disabled:hover,.btn-info[disabled]:hover,fieldset[disabled] .btn-info:hover,.btn-info.disabled:focus,.btn-info[disabled]:focus,fieldset[disabled] .btn-info:focus,.btn-info.disabled:active,.btn-info[disabled]:active,fieldset[disabled] .btn-info:active,.btn-info.disabled.active,.btn-info[disabled].active,fieldset[disabled] .btn-info.active{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#ed9c28;border-color:#d58512}.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning[disabled],fieldset[disabled] .btn-warning,.btn-warning.disabled:hover,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning:hover,.btn-warning.disabled:focus,.btn-warning[disabled]:focus,fieldset[disabled] .btn-warning:focus,.btn-warning.disabled:active,.btn-warning[disabled]:active,fieldset[disabled] .btn-warning:active,.btn-warning.disabled.active,.btn-warning[disabled].active,fieldset[disabled] .btn-warning.active{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#d2322d;border-color:#ac2925}.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger[disabled],fieldset[disabled] .btn-danger,.btn-danger.disabled:hover,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger:hover,.btn-danger.disabled:focus,.btn-danger[disabled]:focus,fieldset[disabled] .btn-danger:focus,.btn-danger.disabled:active,.btn-danger[disabled]:active,fieldset[disabled] .btn-danger:active,.btn-danger.disabled.active,.btn-danger[disabled].active,fieldset[disabled] .btn-danger.active{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{color:#428bca;font-weight:normal;cursor:pointer;border-radius:0}.btn-link,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:hover,.btn-link:focus,.btn-link:active{border-color:transparent}.btn-link:hover,.btn-link:focus{color:#2a6496;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,fieldset[disabled] .btn-link:hover,.btn-link[disabled]:focus,fieldset[disabled] .btn-link:focus{color:#999;text-decoration:none}.btn-lg,.btn-group-lg>.btn{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}.btn-sm,.btn-group-sm>.btn{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-xs,.btn-group-xs>.btn{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%;padding-left:0;padding-right:0}.btn-block+.btn-block{margin-top:5px}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;transition:height .35s ease}@font-face{font-family:'Glyphicons Halflings';src:url('../fonts/glyphicons-halflings-regular.eot');src:url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/glyphicons-halflings-regular.woff') format('woff'),url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'),url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px solid;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;font-size:14px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{text-decoration:none;color:#262626;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;outline:0;background-color:#428bca}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#999}.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);cursor:not-allowed}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{left:auto;right:0}.dropdown-menu-left{left:0;right:auto}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#999}.dropdown-backdrop{position:fixed;left:0;right:0;bottom:0;top:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}@media (min-width:768px){.navbar-right .dropdown-menu{left:auto;right:0}.navbar-right .dropdown-menu-left{left:0;right:auto}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group>.btn,.btn-group-vertical>.btn{position:relative;float:left}.btn-group>.btn:hover,.btn-group-vertical>.btn:hover,.btn-group>.btn:focus,.btn-group-vertical>.btn:focus,.btn-group>.btn:active,.btn-group-vertical>.btn:active,.btn-group>.btn.active,.btn-group-vertical>.btn.active{z-index:2}.btn-group>.btn:focus,.btn-group-vertical>.btn:focus{outline:none}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-bottom-right-radius:0;border-top-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.btn-group>.btn-group{float:left}.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{border-bottom-right-radius:0;border-top-right-radius:0}.btn-group>.btn-group:last-child>.btn:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-left:8px;padding-right:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-left:12px;padding-right:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-bottom-left-radius:4px;border-top-right-radius:0;border-top-left-radius:0}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-right-radius:0;border-top-left-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{float:none;display:table-cell;width:1%}.btn-group-justified>.btn-group .btn{width:100%}[data-toggle="buttons"]>.btn>input[type="radio"],[data-toggle="buttons"]>.btn>input[type="checkbox"]{display:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*="col-"]{float:none;padding-left:0;padding-right:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn,select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn,select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn{height:auto}.input-group-addon,.input-group-btn,.input-group .form-control{display:table-cell}.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child),.input-group .form-control:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:normal;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type="radio"],.input-group-addon input[type="checkbox"]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle),.input-group-btn:last-child>.btn-group:not(:last-child)>.btn{border-bottom-right-radius:0;border-top-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:first-child>.btn-group:not(:first-child)>.btn{border-bottom-left-radius:0;border-top-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:hover,.input-group-btn>.btn:focus,.input-group-btn>.btn:active{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{margin-left:-1px}.nav{margin-bottom:0;padding-left:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#999}.nav>li.disabled>a:hover,.nav>li.disabled>a:focus{color:#999;text-decoration:none;background-color:transparent;cursor:not-allowed}.nav .open>a,.nav .open>a:hover,.nav .open>a:focus{background-color:#eee;border-color:#428bca}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{color:#555;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{text-align:center;margin-bottom:5px}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:hover,.nav-pills>li.active>a:focus{color:#fff;background-color:#428bca}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{text-align:center;margin-bottom:5px}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-right-radius:0;border-top-left-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{max-height:340px;overflow-x:visible;padding-right:15px;padding-left:15px;border-top:1px solid transparent;box-shadow:inset 0 1px 0 rgba(255,255,255,0.1);-webkit-overflow-scrolling:touch}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;box-shadow:none}.navbar-collapse.collapse{display:block !important;height:auto !important;padding-bottom:0;overflow:visible !important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse,.navbar-fixed-bottom .navbar-collapse{padding-left:0;padding-right:0}}.container>.navbar-header,.container-fluid>.navbar-header,.container>.navbar-collapse,.container-fluid>.navbar-collapse{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container>.navbar-header,.container-fluid>.navbar-header,.container>.navbar-collapse,.container-fluid>.navbar-collapse{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;padding:15px 15px;font-size:18px;line-height:20px;height:50px}.navbar-brand:hover,.navbar-brand:focus{text-decoration:none}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;margin-right:15px;padding:9px 10px;margin-top:8px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:none}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;box-shadow:none}.navbar-nav .open .dropdown-menu>li>a,.navbar-nav .open .dropdown-menu .dropdown-header{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:hover,.navbar-nav .open .dropdown-menu>li>a:focus{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}.navbar-nav.navbar-right:last-child{margin-right:-15px}}@media (min-width:768px){.navbar-left{float:left !important}.navbar-right{float:right !important}}.navbar-form{margin-left:-15px;margin-right:-15px;padding:10px 15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);margin-top:8px;margin-bottom:8px}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .radio,.navbar-form .checkbox{display:inline-block;margin-top:0;margin-bottom:0;padding-left:0;vertical-align:middle}.navbar-form .radio input[type="radio"],.navbar-form .checkbox input[type="checkbox"]{float:none;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}}@media (min-width:768px){.navbar-form{width:auto;border:0;margin-left:0;margin-right:0;padding-top:0;padding-bottom:0;-webkit-box-shadow:none;box-shadow:none}.navbar-form.navbar-right:last-child{margin-right:-15px}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-right-radius:0;border-top-left-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-left:15px;margin-right:15px}.navbar-text.navbar-right:last-child{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:hover,.navbar-default .navbar-brand:focus{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:hover,.navbar-default .navbar-nav>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:hover,.navbar-default .navbar-nav>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:hover,.navbar-default .navbar-nav>.disabled>a:focus{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:hover,.navbar-default .navbar-toggle:focus{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:hover,.navbar-default .navbar-nav>.open>a:focus{background-color:#e7e7e7;color:#555}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#999}.navbar-inverse .navbar-brand:hover,.navbar-inverse .navbar-brand:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#999}.navbar-inverse .navbar-nav>li>a{color:#999}.navbar-inverse .navbar-nav>li>a:hover,.navbar-inverse .navbar-nav>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:hover,.navbar-inverse .navbar-nav>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:hover,.navbar-inverse .navbar-nav>.disabled>a:focus{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:hover,.navbar-inverse .navbar-toggle:focus{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:hover,.navbar-inverse .navbar-nav>.open>a:focus{background-color:#080808;color:#fff}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#999}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#999}.navbar-inverse .navbar-link:hover{color:#fff}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;line-height:1.42857143;text-decoration:none;color:#428bca;background-color:#fff;border:1px solid #ddd;margin-left:-1px}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-bottom-left-radius:4px;border-top-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-bottom-right-radius:4px;border-top-right-radius:4px}.pagination>li>a:hover,.pagination>li>span:hover,.pagination>li>a:focus,.pagination>li>span:focus{color:#2a6496;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>span,.pagination>.active>a:hover,.pagination>.active>span:hover,.pagination>.active>a:focus,.pagination>.active>span:focus{z-index:2;color:#fff;background-color:#428bca;border-color:#428bca;cursor:default}.pagination>.disabled>span,.pagination>.disabled>span:hover,.pagination>.disabled>span:focus,.pagination>.disabled>a,.pagination>.disabled>a:hover,.pagination>.disabled>a:focus{color:#999;background-color:#fff;border-color:#ddd;cursor:not-allowed}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-bottom-left-radius:6px;border-top-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-bottom-right-radius:6px;border-top-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-bottom-left-radius:3px;border-top-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-bottom-right-radius:3px;border-top-right-radius:3px}.pager{padding-left:0;margin:20px 0;list-style:none;text-align:center}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>a:focus,.pager .disabled>span{color:#999;background-color:#fff;cursor:not-allowed}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:bold;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}.label[href]:hover,.label[href]:focus{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#999}.label-default[href]:hover,.label-default[href]:focus{background-color:#808080}.label-primary{background-color:#428bca}.label-primary[href]:hover,.label-primary[href]:focus{background-color:#3071a9}.label-success{background-color:#5cb85c}.label-success[href]:hover,.label-success[href]:focus{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:hover,.label-info[href]:focus{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:hover,.label-warning[href]:focus{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:hover,.label-danger[href]:focus{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:bold;color:#fff;line-height:1;vertical-align:baseline;white-space:nowrap;text-align:center;background-color:#999;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-xs .badge{top:0;padding:1px 5px}a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer}a.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#428bca;background-color:#fff}.nav-pills>li>a>.badge{margin-left:3px}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:bold}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable{padding-right:35px}.alert-dismissable .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{background-color:#dff0d8;border-color:#d6e9c6;color:#3c763d}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{background-color:#d9edf7;border-color:#bce8f1;color:#31708f}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{background-color:#fcf8e3;border-color:#faebcc;color:#8a6d3b}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{background-color:#f2dede;border-color:#ebccd1;color:#a94442}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}.list-group{margin-bottom:20px;padding-left:0}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-right-radius:4px;border-top-left-radius:4px}.list-group-item:last-child{margin-bottom:0;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{color:#555}a.list-group-item .list-group-item-heading{color:#333}a.list-group-item:hover,a.list-group-item:focus{text-decoration:none;background-color:#f5f5f5}a.list-group-item.active,a.list-group-item.active:hover,a.list-group-item.active:focus{z-index:2;color:#fff;background-color:#428bca;border-color:#428bca}a.list-group-item.active .list-group-item-heading,a.list-group-item.active:hover .list-group-item-heading,a.list-group-item.active:focus .list-group-item-heading{color:inherit}a.list-group-item.active .list-group-item-text,a.list-group-item.active:hover .list-group-item-text,a.list-group-item.active:focus .list-group-item-text{color:#e1edf7}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:hover,a.list-group-item-success:focus{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:hover,a.list-group-item-success.active:focus{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:hover,a.list-group-item-info:focus{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:hover,a.list-group-item-info.active:focus{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning{color:#8a6d3b}a.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:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:hover,a.list-group-item-warning.active:focus{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:hover,a.list-group-item-danger:focus{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:hover,a.list-group-item-danger.active:focus{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,0.05);box-shadow:0 1px 1px rgba(0,0,0,0.05)}.box-body{padding:15px}.box-header{padding:10px 15px;border-bottom:1px solid transparent;border-top-right-radius:3px;border-top-left-radius:3px}.box-header>.dropdown .dropdown-toggle{color:inherit}.box-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.box-title>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group{margin-bottom:0}.panel>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-right-radius:3px;border-top-left-radius:3px}.panel>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.box-header+.list-group .list-group-item:first-child{border-top-width:0}.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.table:first-child,.panel>.table-responsive:first-child>.table:first-child{border-top-right-radius:3px;border-top-left-radius:3px}.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table:last-child,.panel>.table-responsive:last-child>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.box-body+.table,.panel>.box-body+.table-responsive{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child th,.panel>.table>tbody:first-child>tr:first-child td{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{border:0;margin-bottom:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px;overflow:hidden}.panel-group .panel+.panel{margin-top:5px}.panel-group .box-header{border-bottom:0}.panel-group .box-header+.panel-collapse .box-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .box-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.box-header{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.box-header+.panel-collapse .box-body{border-top-color:#ddd}.panel-default>.panel-footer+.panel-collapse .box-body{border-bottom-color:#ddd}.panel-primary{border-color:#428bca}.panel-primary>.box-header{color:#fff;background-color:#428bca;border-color:#428bca}.panel-primary>.box-header+.panel-collapse .box-body{border-top-color:#428bca}.panel-primary>.panel-footer+.panel-collapse .box-body{border-bottom-color:#428bca}.panel-success{border-color:#d6e9c6}.panel-success>.box-header{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.box-header+.panel-collapse .box-body{border-top-color:#d6e9c6}.panel-success>.panel-footer+.panel-collapse .box-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.box-header{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.box-header+.panel-collapse .box-body{border-top-color:#bce8f1}.panel-info>.panel-footer+.panel-collapse .box-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.box-header{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.box-header+.panel-collapse .box-body{border-top-color:#faebcc}.panel-warning>.panel-footer+.panel-collapse .box-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.box-header{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.box-header+.panel-collapse .box-body{border-top-color:#ebccd1}.panel-danger>.panel-footer+.panel-collapse .box-body{border-bottom-color:#ebccd1}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:bold;line-height:1;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover,.close:focus{color:#000;text-decoration:none;cursor:pointer;opacity:.5;filter:alpha(opacity=50)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.modal-open{overflow:hidden}.modal{display:none;overflow:auto;overflow-y:scroll;position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transform:translate(0, -25%);-ms-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:translate(0, 0);-ms-transform:translate(0, 0);transform:translate(0, 0)}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,0.2);border-radius:6px;-webkit-box-shadow:0 3px 9px rgba(0,0,0,0.5);box-shadow:0 3px 9px rgba(0,0,0,0.5);background-clip:padding-box;outline:none}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{opacity:0;filter:alpha(opacity=0)}.modal-backdrop.in{opacity:.5;filter:alpha(opacity=50)}.modal-header{padding:15px;border-bottom:1px solid #e5e5e5;min-height:16.42857143px}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:20px}.modal-footer{margin-top:15px;padding:19px 20px 20px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-left:5px;margin-bottom:0}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,0.5);box-shadow:0 5px 15px rgba(0,0,0,0.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.clearfix:before,.clearfix:after,.container:before,.container:after,.container-fluid:before,.container-fluid:after,.row:before,.row:after,.form-horizontal .form-group:before,.form-horizontal .form-group:after,.btn-toolbar:before,.btn-toolbar:after,.btn-group-vertical>.btn-group:before,.btn-group-vertical>.btn-group:after,.nav:before,.nav:after,.navbar:before,.navbar:after,.navbar-header:before,.navbar-header:after,.navbar-collapse:before,.navbar-collapse:after,.pager:before,.pager:after,.box-body:before,.box-body:after,.modal-footer:before,.modal-footer:after{content:" ";display:table}.clearfix:after,.container:after,.container-fluid:after,.row:after,.form-horizontal .form-group:after,.btn-toolbar:after,.btn-group-vertical>.btn-group:after,.nav:after,.navbar:after,.navbar-header:after,.navbar-collapse:after,.pager:after,.box-body:after,.modal-footer:after{clear:both}.center-block{display:block;margin-left:auto;margin-right:auto}.pull-right{float:right !important}.pull-left{float:left !important}.hide{display:none !important}.show{display:block !important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none !important;visibility:hidden !important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-xs,.visible-sm,.visible-md,.visible-lg{display:none !important}@media (max-width:767px){.visible-xs{display:block !important}table.visible-xs{display:table}tr.visible-xs{display:table-row !important}th.visible-xs,td.visible-xs{display:table-cell !important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block !important}table.visible-sm{display:table}tr.visible-sm{display:table-row !important}th.visible-sm,td.visible-sm{display:table-cell !important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block !important}table.visible-md{display:table}tr.visible-md{display:table-row !important}th.visible-md,td.visible-md{display:table-cell !important}}@media (min-width:1200px){.visible-lg{display:block !important}table.visible-lg{display:table}tr.visible-lg{display:table-row !important}th.visible-lg,td.visible-lg{display:table-cell !important}}@media (max-width:767px){.hidden-xs{display:none !important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none !important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none !important}}@media (min-width:1200px){.hidden-lg{display:none !important}}.visible-print{display:none !important}@media print{.visible-print{display:block !important}table.visible-print{display:table}tr.visible-print{display:table-row !important}th.visible-print,td.visible-print{display:table-cell !important}}@media print{.hidden-print{display:none !important}}
+/*! normalize.css v3.0.0 | MIT License | git.io/normalize */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}h1{font-size:2em;margin:0.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace, monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}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,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:bold}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}@media print{*{text-shadow:none !important;color:#000 !important;background:transparent !important;box-shadow:none !important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100% !important}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}select{background:#fff !important}.navbar{display:none}.table td,.table th{background-color:#fff !important}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000 !important}.label{border:1px solid #000}.table{border-collapse:collapse !important}.table-bordered th,.table-bordered td{border:1px solid #ddd !important}}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:62.5%;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#428bca;text-decoration:none}a:hover,a:focus{color:#2a6496;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.img-responsive{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out;display:inline-block;max-width:100%;height:auto}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,.h1 small,.h2 small,.h3 small,.h4 small,.h5 small,.h6 small,h1 .small,h2 .small,h3 .small,h4 .small,h5 .small,h6 .small,.h1 .small,.h2 .small,.h3 .small,.h4 .small,.h5 .small,.h6 .small{font-weight:normal;line-height:1;color:#999}h1,.h1,h2,.h2,h3,.h3{margin-top:20px;margin-bottom:10px}h1 small,.h1 small,h2 small,.h2 small,h3 small,.h3 small,h1 .small,.h1 .small,h2 .small,.h2 .small,h3 .small,.h3 .small{font-size:65%}h4,.h4,h5,.h5,h6,.h6{margin-top:10px;margin-bottom:10px}h4 small,.h4 small,h5 small,.h5 small,h6 small,.h6 small,h4 .small,.h4 .small,h5 .small,.h5 .small,h6 .small,.h6 .small{font-size:75%}h1,.h1{font-size:36px}h2,.h2{font-size:30px}h3,.h3{font-size:24px}h4,.h4{font-size:18px}h5,.h5{font-size:14px}h6,.h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:200;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}small,.small{font-size:85%}cite{font-style:normal}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-muted{color:#999}.text-primary{color:#428bca}a.text-primary:hover{color:#3071a9}.text-success{color:#3c763d}a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#428bca}a.bg-primary:hover{background-color:#3071a9}.bg-success{background-color:#dff0d8}a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ul,ol{margin-top:0;margin-bottom:10px}ul ul,ol ul,ul ol,ol ol{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;list-style:none;margin-left:-5px}.list-inline>li{display:inline-block;padding-left:5px;padding-right:5px}dl{margin-top:0;margin-bottom:20px}dt,dd{line-height:1.42857143}dt{font-weight:bold}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;clear:left;text-align:right;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote p:last-child,blockquote ul:last-child,blockquote ol:last-child{margin-bottom:0}blockquote footer,blockquote small,blockquote .small{display:block;font-size:80%;line-height:1.42857143;color:#999}blockquote footer:before,blockquote small:before,blockquote .small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0;text-align:right}.blockquote-reverse footer:before,blockquote.pull-right footer:before,.blockquote-reverse small:before,blockquote.pull-right small:before,.blockquote-reverse .small:before,blockquote.pull-right .small:before{content:''}.blockquote-reverse footer:after,blockquote.pull-right footer:after,.blockquote-reverse small:after,blockquote.pull-right small:after,.blockquote-reverse .small:after,blockquote.pull-right .small:after{content:'\00A0 \2014'}blockquote:before,blockquote:after{content:""}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;white-space:nowrap;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;box-shadow:inset 0 -1px 0 rgba(0,0,0,0.25)}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;word-break:break-all;word-wrap:break-word;color:#333;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px}.row{margin-left:-15px;margin-right:-15px}.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12{position:relative;min-height:1px;padding-left:15px;padding-right:15px}.col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:0}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:0}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:0}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:0}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:0}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:0}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:0}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:0}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{max-width:100%;background-color:transparent}th{text-align:left}.table{width:100%;margin-bottom:20px}.table>thead>tr>th,.table>tbody>tr>th,.table>tfoot>tr>th,.table>thead>tr>td,.table>tbody>tr>td,.table>tfoot>tr>td{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>th,.table>caption+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>td,.table>thead:first-child>tr:first-child>td{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>thead>tr>th,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>tbody>tr>td,.table-condensed>tfoot>tr>td{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>tbody>tr>td,.table-bordered>tfoot>tr>td{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>thead>tr>td{border-bottom-width:2px}.table-striped>tbody>tr:nth-child(odd)>td,.table-striped>tbody>tr:nth-child(odd)>th{background-color:#f9f9f9}.table-hover>tbody>tr:hover>td,.table-hover>tbody>tr:hover>th{background-color:#f5f5f5}table col[class*="col-"]{position:static;float:none;display:table-column}table td[class*="col-"],table th[class*="col-"]{position:static;float:none;display:table-cell}.table>thead>tr>td.active,.table>tbody>tr>td.active,.table>tfoot>tr>td.active,.table>thead>tr>th.active,.table>tbody>tr>th.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>tbody>tr.active>td,.table>tfoot>tr.active>td,.table>thead>tr.active>th,.table>tbody>tr.active>th,.table>tfoot>tr.active>th{background-color:#f5f5f5}.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover,.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th{background-color:#e8e8e8}.table>thead>tr>td.success,.table>tbody>tr>td.success,.table>tfoot>tr>td.success,.table>thead>tr>th.success,.table>tbody>tr>th.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>tbody>tr.success>td,.table>tfoot>tr.success>td,.table>thead>tr.success>th,.table>tbody>tr.success>th,.table>tfoot>tr.success>th{background-color:#dff0d8}.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.success:hover>th{background-color:#d0e9c6}.table>thead>tr>td.info,.table>tbody>tr>td.info,.table>tfoot>tr>td.info,.table>thead>tr>th.info,.table>tbody>tr>th.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>tbody>tr.info>td,.table>tfoot>tr.info>td,.table>thead>tr.info>th,.table>tbody>tr.info>th,.table>tfoot>tr.info>th{background-color:#d9edf7}.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.info:hover>th{background-color:#c4e3f3}.table>thead>tr>td.warning,.table>tbody>tr>td.warning,.table>tfoot>tr>td.warning,.table>thead>tr>th.warning,.table>tbody>tr>th.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>tbody>tr.warning>td,.table>tfoot>tr.warning>td,.table>thead>tr.warning>th,.table>tbody>tr.warning>th,.table>tfoot>tr.warning>th{background-color:#fcf8e3}.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.warning:hover>th{background-color:#faf2cc}.table>thead>tr>td.danger,.table>tbody>tr>td.danger,.table>tfoot>tr>td.danger,.table>thead>tr>th.danger,.table>tbody>tr>th.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>tbody>tr.danger>td,.table>tfoot>tr.danger>td,.table>thead>tr.danger>th,.table>tbody>tr.danger>th,.table>tfoot>tr.danger>th{background-color:#f2dede}.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.danger:hover>th{background-color:#ebcccc}@media (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;overflow-x:scroll;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd;-webkit-overflow-scrolling:touch}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>thead>tr>th,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tfoot>tr>td{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>thead>tr>th:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.table-responsive>.table-bordered>thead>tr>th:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>th,.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}}fieldset{padding:0;margin:0;border:0;min-width:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;margin-bottom:5px;font-weight:bold}input[type="search"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type="radio"],input[type="checkbox"]{margin:4px 0 0;margin-top:1px \9;line-height:normal}input[type="file"]{display:block}input[type="range"]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-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);-webkit-transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#eee;opacity:1}textarea.form-control{height:auto}input[type="search"]{-webkit-appearance:none}input[type="date"]{line-height:34px}.form-group{margin-bottom:15px}.radio,.checkbox{display:block;min-height:20px;margin-top:10px;margin-bottom:10px;padding-left:20px}.radio label,.checkbox label{display:inline;font-weight:normal;cursor:pointer}.radio input[type="radio"],.radio-inline input[type="radio"],.checkbox input[type="checkbox"],.checkbox-inline input[type="checkbox"]{float:left;margin-left:-20px}.radio+.radio,.checkbox+.checkbox{margin-top:-5px}.radio-inline,.checkbox-inline{display:inline-block;padding-left:20px;margin-bottom:0;vertical-align:middle;font-weight:normal;cursor:pointer}.radio-inline+.radio-inline,.checkbox-inline+.checkbox-inline{margin-top:0;margin-left:10px}input[type="radio"][disabled],input[type="checkbox"][disabled],.radio[disabled],.radio-inline[disabled],.checkbox[disabled],.checkbox-inline[disabled],fieldset[disabled] input[type="radio"],fieldset[disabled] input[type="checkbox"],fieldset[disabled] .radio,fieldset[disabled] .radio-inline,fieldset[disabled] .checkbox,fieldset[disabled] .checkbox-inline{cursor:not-allowed}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}textarea.input-sm,select[multiple].input-sm{height:auto}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-lg{height:46px;line-height:46px}textarea.input-lg,select[multiple].input-lg{height:auto}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.has-feedback .form-control-feedback{position:absolute;top:25px;right:0;display:block;width:34px;height:34px;line-height:34px;text-align:center}.has-success .help-block,.has-success .control-label,.has-success .radio,.has-success .checkbox,.has-success .radio-inline,.has-success .checkbox-inline{color:#3c763d}.has-success .form-control{border-color:#3c763d;-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:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;border-color:#3c763d;background-color:#dff0d8}.has-success .form-control-feedback{color:#3c763d}.has-warning .help-block,.has-warning .control-label,.has-warning .radio,.has-warning .checkbox,.has-warning .radio-inline,.has-warning .checkbox-inline{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-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}.has-warning .input-group-addon{color:#8a6d3b;border-color:#8a6d3b;background-color:#fcf8e3}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .help-block,.has-error .control-label,.has-error .radio,.has-error .checkbox,.has-error .radio-inline,.has-error .checkbox-inline{color:#a94442}.has-error .form-control{border-color:#a94442;-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:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;border-color:#a94442;background-color:#f2dede}.has-error .form-control-feedback{color:#a94442}.form-control-static{margin-bottom:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .radio,.form-inline .checkbox{display:inline-block;margin-top:0;margin-bottom:0;padding-left:0;vertical-align:middle}.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:none;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .control-label,.form-horizontal .radio,.form-horizontal .checkbox,.form-horizontal .radio-inline,.form-horizontal .checkbox-inline{margin-top:0;margin-bottom:0;padding-top:7px}.form-horizontal .radio,.form-horizontal .checkbox{min-height:27px}.form-horizontal .form-group{margin-left:-15px;margin-right:-15px}.form-horizontal .form-control-static{padding-top:7px}@media (min-width:768px){.form-horizontal .control-label{text-align:right}}.form-horizontal .has-feedback .form-control-feedback{top:0;right:15px}.btn{display:inline-block;margin-bottom:0;font-weight:normal;text-align:center;vertical-align:middle;cursor:pointer;background-image:none;border:1px solid transparent;white-space:nowrap;padding:6px 12px;font-size:14px;line-height:1.42857143;border-radius:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.btn:focus,.btn:active:focus,.btn.active:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn:hover,.btn:focus{color:#333;text-decoration:none}.btn:active,.btn.active{outline:0;background-image:none;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;pointer-events:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default:hover,.btn-default:focus,.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{color:#333;background-color:#ebebeb;border-color:#adadad}.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default[disabled],fieldset[disabled] .btn-default,.btn-default.disabled:hover,.btn-default[disabled]:hover,fieldset[disabled] .btn-default:hover,.btn-default.disabled:focus,.btn-default[disabled]:focus,fieldset[disabled] .btn-default:focus,.btn-default.disabled:active,.btn-default[disabled]:active,fieldset[disabled] .btn-default:active,.btn-default.disabled.active,.btn-default[disabled].active,fieldset[disabled] .btn-default.active{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#428bca;border-color:#357ebd}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#3276b1;border-color:#285e8e}.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]:focus,fieldset[disabled] .btn-primary:focus,.btn-primary.disabled:active,.btn-primary[disabled]:active,fieldset[disabled] .btn-primary:active,.btn-primary.disabled.active,.btn-primary[disabled].active,fieldset[disabled] .btn-primary.active{background-color:#428bca;border-color:#357ebd}.btn-primary .badge{color:#428bca;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{color:#fff;background-color:#47a447;border-color:#398439}.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{background-image:none}.btn-success.disabled,.btn-success[disabled],fieldset[disabled] .btn-success,.btn-success.disabled:hover,.btn-success[disabled]:hover,fieldset[disabled] .btn-success:hover,.btn-success.disabled:focus,.btn-success[disabled]:focus,fieldset[disabled] .btn-success:focus,.btn-success.disabled:active,.btn-success[disabled]:active,fieldset[disabled] .btn-success:active,.btn-success.disabled.active,.btn-success[disabled].active,fieldset[disabled] .btn-success.active{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{color:#fff;background-color:#39b3d7;border-color:#269abc}.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info[disabled],fieldset[disabled] .btn-info,.btn-info.disabled:hover,.btn-info[disabled]:hover,fieldset[disabled] .btn-info:hover,.btn-info.disabled:focus,.btn-info[disabled]:focus,fieldset[disabled] .btn-info:focus,.btn-info.disabled:active,.btn-info[disabled]:active,fieldset[disabled] .btn-info:active,.btn-info.disabled.active,.btn-info[disabled].active,fieldset[disabled] .btn-info.active{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#ed9c28;border-color:#d58512}.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning[disabled],fieldset[disabled] .btn-warning,.btn-warning.disabled:hover,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning:hover,.btn-warning.disabled:focus,.btn-warning[disabled]:focus,fieldset[disabled] .btn-warning:focus,.btn-warning.disabled:active,.btn-warning[disabled]:active,fieldset[disabled] .btn-warning:active,.btn-warning.disabled.active,.btn-warning[disabled].active,fieldset[disabled] .btn-warning.active{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#d2322d;border-color:#ac2925}.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger[disabled],fieldset[disabled] .btn-danger,.btn-danger.disabled:hover,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger:hover,.btn-danger.disabled:focus,.btn-danger[disabled]:focus,fieldset[disabled] .btn-danger:focus,.btn-danger.disabled:active,.btn-danger[disabled]:active,fieldset[disabled] .btn-danger:active,.btn-danger.disabled.active,.btn-danger[disabled].active,fieldset[disabled] .btn-danger.active{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{color:#428bca;font-weight:normal;cursor:pointer;border-radius:0}.btn-link,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:hover,.btn-link:focus,.btn-link:active{border-color:transparent}.btn-link:hover,.btn-link:focus{color:#2a6496;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,fieldset[disabled] .btn-link:hover,.btn-link[disabled]:focus,fieldset[disabled] .btn-link:focus{color:#999;text-decoration:none}.btn-lg,.btn-group-lg>.btn{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}.btn-sm,.btn-group-sm>.btn{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-xs,.btn-group-xs>.btn{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%;padding-left:0;padding-right:0}.btn-block+.btn-block{margin-top:5px}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;transition:height .35s ease}@font-face{font-family:'Glyphicons Halflings';src:url('../fonts/glyphicons-halflings-regular.eot');src:url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/glyphicons-halflings-regular.woff') format('woff'),url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'),url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px solid;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;font-size:14px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{text-decoration:none;color:#262626;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;outline:0;background-color:#428bca}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#999}.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);cursor:not-allowed}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{left:auto;right:0}.dropdown-menu-left{left:0;right:auto}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#999}.dropdown-backdrop{position:fixed;left:0;right:0;bottom:0;top:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}@media (min-width:768px){.navbar-right .dropdown-menu{left:auto;right:0}.navbar-right .dropdown-menu-left{left:0;right:auto}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group>.btn,.btn-group-vertical>.btn{position:relative;float:left}.btn-group>.btn:hover,.btn-group-vertical>.btn:hover,.btn-group>.btn:focus,.btn-group-vertical>.btn:focus,.btn-group>.btn:active,.btn-group-vertical>.btn:active,.btn-group>.btn.active,.btn-group-vertical>.btn.active{z-index:2}.btn-group>.btn:focus,.btn-group-vertical>.btn:focus{outline:none}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-bottom-right-radius:0;border-top-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.btn-group>.btn-group{float:left}.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{border-bottom-right-radius:0;border-top-right-radius:0}.btn-group>.btn-group:last-child>.btn:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-left:8px;padding-right:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-left:12px;padding-right:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-bottom-left-radius:4px;border-top-right-radius:0;border-top-left-radius:0}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-right-radius:0;border-top-left-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{float:none;display:table-cell;width:1%}.btn-group-justified>.btn-group .btn{width:100%}[data-toggle="buttons"]>.btn>input[type="radio"],[data-toggle="buttons"]>.btn>input[type="checkbox"]{display:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*="col-"]{float:none;padding-left:0;padding-right:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn,select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn,select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn{height:auto}.input-group-addon,.input-group-btn,.input-group .form-control{display:table-cell}.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child),.input-group .form-control:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:normal;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type="radio"],.input-group-addon input[type="checkbox"]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle),.input-group-btn:last-child>.btn-group:not(:last-child)>.btn{border-bottom-right-radius:0;border-top-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:first-child>.btn-group:not(:first-child)>.btn{border-bottom-left-radius:0;border-top-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:hover,.input-group-btn>.btn:focus,.input-group-btn>.btn:active{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{margin-left:-1px}.nav{margin-bottom:0;padding-left:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#999}.nav>li.disabled>a:hover,.nav>li.disabled>a:focus{color:#999;text-decoration:none;background-color:transparent;cursor:not-allowed}.nav .open>a,.nav .open>a:hover,.nav .open>a:focus{background-color:#eee;border-color:#428bca}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{color:#555;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{text-align:center;margin-bottom:5px}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:hover,.nav-pills>li.active>a:focus{color:#fff;background-color:#428bca}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{text-align:center;margin-bottom:5px}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-right-radius:0;border-top-left-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{max-height:340px;overflow-x:visible;padding-right:15px;padding-left:15px;border-top:1px solid transparent;box-shadow:inset 0 1px 0 rgba(255,255,255,0.1);-webkit-overflow-scrolling:touch}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;box-shadow:none}.navbar-collapse.collapse{display:block !important;height:auto !important;padding-bottom:0;overflow:visible !important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse,.navbar-fixed-bottom .navbar-collapse{padding-left:0;padding-right:0}}.container>.navbar-header,.container-fluid>.navbar-header,.container>.navbar-collapse,.container-fluid>.navbar-collapse{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container>.navbar-header,.container-fluid>.navbar-header,.container>.navbar-collapse,.container-fluid>.navbar-collapse{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;padding:15px 15px;font-size:18px;line-height:20px;height:50px}.navbar-brand:hover,.navbar-brand:focus{text-decoration:none}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;margin-right:15px;padding:9px 10px;margin-top:8px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:none}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;box-shadow:none}.navbar-nav .open .dropdown-menu>li>a,.navbar-nav .open .dropdown-menu .dropdown-header{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:hover,.navbar-nav .open .dropdown-menu>li>a:focus{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}.navbar-nav.navbar-right:last-child{margin-right:-15px}}@media (min-width:768px){.navbar-left{float:left !important}.navbar-right{float:right !important}}.navbar-form{margin-left:-15px;margin-right:-15px;padding:10px 15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);margin-top:8px;margin-bottom:8px}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .radio,.navbar-form .checkbox{display:inline-block;margin-top:0;margin-bottom:0;padding-left:0;vertical-align:middle}.navbar-form .radio input[type="radio"],.navbar-form .checkbox input[type="checkbox"]{float:none;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}}@media (min-width:768px){.navbar-form{width:auto;border:0;margin-left:0;margin-right:0;padding-top:0;padding-bottom:0;-webkit-box-shadow:none;box-shadow:none}.navbar-form.navbar-right:last-child{margin-right:-15px}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-right-radius:0;border-top-left-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-left:15px;margin-right:15px}.navbar-text.navbar-right:last-child{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:hover,.navbar-default .navbar-brand:focus{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:hover,.navbar-default .navbar-nav>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:hover,.navbar-default .navbar-nav>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:hover,.navbar-default .navbar-nav>.disabled>a:focus{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:hover,.navbar-default .navbar-toggle:focus{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:hover,.navbar-default .navbar-nav>.open>a:focus{background-color:#e7e7e7;color:#555}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#999}.navbar-inverse .navbar-brand:hover,.navbar-inverse .navbar-brand:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#999}.navbar-inverse .navbar-nav>li>a{color:#999}.navbar-inverse .navbar-nav>li>a:hover,.navbar-inverse .navbar-nav>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:hover,.navbar-inverse .navbar-nav>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:hover,.navbar-inverse .navbar-nav>.disabled>a:focus{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:hover,.navbar-inverse .navbar-toggle:focus{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:hover,.navbar-inverse .navbar-nav>.open>a:focus{background-color:#080808;color:#fff}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#999}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#999}.navbar-inverse .navbar-link:hover{color:#fff}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;line-height:1.42857143;text-decoration:none;color:#428bca;background-color:#fff;border:1px solid #ddd;margin-left:-1px}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-bottom-left-radius:4px;border-top-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-bottom-right-radius:4px;border-top-right-radius:4px}.pagination>li>a:hover,.pagination>li>span:hover,.pagination>li>a:focus,.pagination>li>span:focus{color:#2a6496;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>span,.pagination>.active>a:hover,.pagination>.active>span:hover,.pagination>.active>a:focus,.pagination>.active>span:focus{z-index:2;color:#fff;background-color:#428bca;border-color:#428bca;cursor:default}.pagination>.disabled>span,.pagination>.disabled>span:hover,.pagination>.disabled>span:focus,.pagination>.disabled>a,.pagination>.disabled>a:hover,.pagination>.disabled>a:focus{color:#999;background-color:#fff;border-color:#ddd;cursor:not-allowed}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-bottom-left-radius:6px;border-top-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-bottom-right-radius:6px;border-top-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-bottom-left-radius:3px;border-top-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-bottom-right-radius:3px;border-top-right-radius:3px}.pager{padding-left:0;margin:20px 0;list-style:none;text-align:center}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>a:focus,.pager .disabled>span{color:#999;background-color:#fff;cursor:not-allowed}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:bold;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}.label[href]:hover,.label[href]:focus{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#999}.label-default[href]:hover,.label-default[href]:focus{background-color:#808080}.label-primary{background-color:#428bca}.label-primary[href]:hover,.label-primary[href]:focus{background-color:#3071a9}.label-success{background-color:#5cb85c}.label-success[href]:hover,.label-success[href]:focus{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:hover,.label-info[href]:focus{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:hover,.label-warning[href]:focus{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:hover,.label-danger[href]:focus{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:bold;color:#fff;line-height:1;vertical-align:baseline;white-space:nowrap;text-align:center;background-color:#999;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-xs .badge{top:0;padding:1px 5px}a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer}a.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#428bca;background-color:#fff}.nav-pills>li>a>.badge{margin-left:3px}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:bold}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable{padding-right:35px}.alert-dismissable .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{background-color:#dff0d8;border-color:#d6e9c6;color:#3c763d}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{background-color:#d9edf7;border-color:#bce8f1;color:#31708f}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{background-color:#fcf8e3;border-color:#faebcc;color:#8a6d3b}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{background-color:#f2dede;border-color:#ebccd1;color:#a94442}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}.list-group{margin-bottom:20px;padding-left:0}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-right-radius:4px;border-top-left-radius:4px}.list-group-item:last-child{margin-bottom:0;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{color:#555}a.list-group-item .list-group-item-heading{color:#333}a.list-group-item:hover,a.list-group-item:focus{text-decoration:none;background-color:#f5f5f5}a.list-group-item.active,a.list-group-item.active:hover,a.list-group-item.active:focus{z-index:2;color:#fff;background-color:#428bca;border-color:#428bca}a.list-group-item.active .list-group-item-heading,a.list-group-item.active:hover .list-group-item-heading,a.list-group-item.active:focus .list-group-item-heading{color:inherit}a.list-group-item.active .list-group-item-text,a.list-group-item.active:hover .list-group-item-text,a.list-group-item.active:focus .list-group-item-text{color:#e1edf7}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:hover,a.list-group-item-success:focus{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:hover,a.list-group-item-success.active:focus{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:hover,a.list-group-item-info:focus{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:hover,a.list-group-item-info.active:focus{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning{color:#8a6d3b}a.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:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:hover,a.list-group-item-warning.active:focus{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:hover,a.list-group-item-danger:focus{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:hover,a.list-group-item-danger.active:focus{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,0.05);box-shadow:0 1px 1px rgba(0,0,0,0.05)}.box-body{padding:15px}.box-header{padding:10px 15px;border-bottom:1px solid transparent;border-top-right-radius:3px;border-top-left-radius:3px}.box-header>.dropdown .dropdown-toggle{color:inherit}.box-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.box-title>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group{margin-bottom:0}.panel>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-right-radius:3px;border-top-left-radius:3px}.panel>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.box-header+.list-group .list-group-item:first-child{border-top-width:0}.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.table:first-child,.panel>.table-responsive:first-child>.table:first-child{border-top-right-radius:3px;border-top-left-radius:3px}.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table:last-child,.panel>.table-responsive:last-child>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.box-body+.table,.panel>.box-body+.table-responsive{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child th,.panel>.table>tbody:first-child>tr:first-child td{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{border:0;margin-bottom:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px;overflow:hidden}.panel-group .panel+.panel{margin-top:5px}.panel-group .box-header{border-bottom:0}.panel-group .box-header+.panel-collapse .box-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .box-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.box-header{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.box-header+.panel-collapse .box-body{border-top-color:#ddd}.panel-default>.panel-footer+.panel-collapse .box-body{border-bottom-color:#ddd}.panel-primary{border-color:#428bca}.panel-primary>.box-header{color:#fff;background-color:#428bca;border-color:#428bca}.panel-primary>.box-header+.panel-collapse .box-body{border-top-color:#428bca}.panel-primary>.panel-footer+.panel-collapse .box-body{border-bottom-color:#428bca}.panel-success{border-color:#d6e9c6}.panel-success>.box-header{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.box-header+.panel-collapse .box-body{border-top-color:#d6e9c6}.panel-success>.panel-footer+.panel-collapse .box-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.box-header{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.box-header+.panel-collapse .box-body{border-top-color:#bce8f1}.panel-info>.panel-footer+.panel-collapse .box-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.box-header{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.box-header+.panel-collapse .box-body{border-top-color:#faebcc}.panel-warning>.panel-footer+.panel-collapse .box-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.box-header{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.box-header+.panel-collapse .box-body{border-top-color:#ebccd1}.panel-danger>.panel-footer+.panel-collapse .box-body{border-bottom-color:#ebccd1}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:bold;line-height:1;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover,.close:focus{color:#000;text-decoration:none;cursor:pointer;opacity:.5;filter:alpha(opacity=50)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.modal-open{overflow:hidden}.modal{display:none;overflow:auto;overflow-y:scroll;position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transform:translate(0, -25%);-ms-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:translate(0, 0);-ms-transform:translate(0, 0);transform:translate(0, 0)}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,0.2);border-radius:6px;-webkit-box-shadow:0 3px 9px rgba(0,0,0,0.5);box-shadow:0 3px 9px rgba(0,0,0,0.5);background-clip:padding-box;outline:none}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{opacity:0;filter:alpha(opacity=0)}.modal-backdrop.in{opacity:.5;filter:alpha(opacity=50)}.modal-header{padding:15px;border-bottom:1px solid #e5e5e5;min-height:16.42857143px}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:20px}.modal-footer{margin-top:15px;padding:19px 20px 20px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-left:5px;margin-bottom:0}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,0.5);box-shadow:0 5px 15px rgba(0,0,0,0.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.clearfix:before,.clearfix:after,.container:before,.container:after,.container-fluid:before,.container-fluid:after,.row:before,.row:after,.form-horizontal .form-group:before,.form-horizontal .form-group:after,.btn-toolbar:before,.btn-toolbar:after,.btn-group-vertical>.btn-group:before,.btn-group-vertical>.btn-group:after,.nav:before,.nav:after,.navbar:before,.navbar:after,.navbar-header:before,.navbar-header:after,.navbar-collapse:before,.navbar-collapse:after,.pager:before,.pager:after,.box-body:before,.box-body:after,.modal-footer:before,.modal-footer:after{content:" ";display:table}.clearfix:after,.container:after,.container-fluid:after,.row:after,.form-horizontal .form-group:after,.btn-toolbar:after,.btn-group-vertical>.btn-group:after,.nav:after,.navbar:after,.navbar-header:after,.navbar-collapse:after,.pager:after,.box-body:after,.modal-footer:after{clear:both}.center-block{display:block;margin-left:auto;margin-right:auto}.pull-right{float:right !important}.pull-left{float:left !important}.hide{display:none !important}.show{display:block !important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none !important;visibility:hidden !important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-xs,.visible-sm,.visible-md,.visible-lg{display:none !important}@media (max-width:767px){.visible-xs{display:block !important}table.visible-xs{display:table}tr.visible-xs{display:table-row !important}th.visible-xs,td.visible-xs{display:table-cell !important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block !important}table.visible-sm{display:table}tr.visible-sm{display:table-row !important}th.visible-sm,td.visible-sm{display:table-cell !important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block !important}table.visible-md{display:table}tr.visible-md{display:table-row !important}th.visible-md,td.visible-md{display:table-cell !important}}@media (min-width:1200px){.visible-lg{display:block !important}table.visible-lg{display:table}tr.visible-lg{display:table-row !important}th.visible-lg,td.visible-lg{display:table-cell !important}}@media (max-width:767px){.hidden-xs{display:none !important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none !important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none !important}}@media (min-width:1200px){.hidden-lg{display:none !important}}.visible-print{display:none !important}@media print{.visible-print{display:block !important}table.visible-print{display:table}tr.visible-print{display:table-row !important}th.visible-print,td.visible-print{display:table-cell !important}}@media print{.hidden-print{display:none !important}}
\ No newline at end of file
diff --git a/public/assets/js/bootstrap.min.js b/public/assets/js/bootstrap.min.js
index 9e2add70..856dc42f 100755
--- a/public/assets/js/bootstrap.min.js
+++ b/public/assets/js/bootstrap.min.js
@@ -1,11 +1,7 @@
 /*!
- * Bootstrap v3.2.0 (http://getbootstrap.com)
+ * Bootstrap v3.1.1 (http://getbootstrap.com)
  * Copyright 2011-2014 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
 
-/*!
- * Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=09c8c466aa06e64a7262)
- * Config saved to config.json and https://gist.github.com/09c8c466aa06e64a7262
- */
-if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(t){"use strict";function e(e){return this.each(function(){var i=t(this),s=i.data("bs.alert");s||i.data("bs.alert",s=new o(this)),"string"==typeof e&&s[e].call(i)})}var i='[data-dismiss="alert"]',o=function(e){t(e).on("click",i,this.close)};o.VERSION="3.2.0",o.prototype.close=function(e){function i(){n.detach().trigger("closed.bs.alert").remove()}var o=t(this),s=o.attr("data-target");s||(s=o.attr("href"),s=s&&s.replace(/.*(?=#[^\s]*$)/,""));var n=t(s);e&&e.preventDefault(),n.length||(n=o.hasClass("alert")?o:o.parent()),n.trigger(e=t.Event("close.bs.alert")),e.isDefaultPrevented()||(n.removeClass("in"),t.support.transition&&n.hasClass("fade")?n.one("bsTransitionEnd",i).emulateTransitionEnd(150):i())};var s=t.fn.alert;t.fn.alert=e,t.fn.alert.Constructor=o,t.fn.alert.noConflict=function(){return t.fn.alert=s,this},t(document).on("click.bs.alert.data-api",i,o.prototype.close)}(jQuery),+function(t){"use strict";function e(e){return this.each(function(){var o=t(this),s=o.data("bs.button"),n="object"==typeof e&&e;s||o.data("bs.button",s=new i(this,n)),"toggle"==e?s.toggle():e&&s.setState(e)})}var i=function(e,o){this.$element=t(e),this.options=t.extend({},i.DEFAULTS,o),this.isLoading=!1};i.VERSION="3.2.0",i.DEFAULTS={loadingText:"loading..."},i.prototype.setState=function(e){var i="disabled",o=this.$element,s=o.is("input")?"val":"html",n=o.data();e+="Text",null==n.resetText&&o.data("resetText",o[s]()),o[s](null==n[e]?this.options[e]:n[e]),setTimeout(t.proxy(function(){"loadingText"==e?(this.isLoading=!0,o.addClass(i).attr(i,i)):this.isLoading&&(this.isLoading=!1,o.removeClass(i).removeAttr(i))},this),0)},i.prototype.toggle=function(){var t=!0,e=this.$element.closest('[data-toggle="buttons"]');if(e.length){var i=this.$element.find("input");"radio"==i.prop("type")&&(i.prop("checked")&&this.$element.hasClass("active")?t=!1:e.find(".active").removeClass("active")),t&&i.prop("checked",!this.$element.hasClass("active")).trigger("change")}t&&this.$element.toggleClass("active")};var o=t.fn.button;t.fn.button=e,t.fn.button.Constructor=i,t.fn.button.noConflict=function(){return t.fn.button=o,this},t(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(i){var o=t(i.target);o.hasClass("btn")||(o=o.closest(".btn")),e.call(o,"toggle"),i.preventDefault()})}(jQuery),+function(t){"use strict";function e(e){return this.each(function(){var o=t(this),s=o.data("bs.carousel"),n=t.extend({},i.DEFAULTS,o.data(),"object"==typeof e&&e),r="string"==typeof e?e:n.slide;s||o.data("bs.carousel",s=new i(this,n)),"number"==typeof e?s.to(e):r?s[r]():n.interval&&s.pause().cycle()})}var i=function(e,i){this.$element=t(e).on("keydown.bs.carousel",t.proxy(this.keydown,this)),this.$indicators=this.$element.find(".carousel-indicators"),this.options=i,this.paused=this.sliding=this.interval=this.$active=this.$items=null,"hover"==this.options.pause&&this.$element.on("mouseenter.bs.carousel",t.proxy(this.pause,this)).on("mouseleave.bs.carousel",t.proxy(this.cycle,this))};i.VERSION="3.2.0",i.DEFAULTS={interval:5e3,pause:"hover",wrap:!0},i.prototype.keydown=function(t){switch(t.which){case 37:this.prev();break;case 39:this.next();break;default:return}t.preventDefault()},i.prototype.cycle=function(e){return e||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(t.proxy(this.next,this),this.options.interval)),this},i.prototype.getItemIndex=function(t){return this.$items=t.parent().children(".item"),this.$items.index(t||this.$active)},i.prototype.to=function(e){var i=this,o=this.getItemIndex(this.$active=this.$element.find(".item.active"));return e>this.$items.length-1||0>e?void 0:this.sliding?this.$element.one("slid.bs.carousel",function(){i.to(e)}):o==e?this.pause().cycle():this.slide(e>o?"next":"prev",t(this.$items[e]))},i.prototype.pause=function(e){return e||(this.paused=!0),this.$element.find(".next, .prev").length&&t.support.transition&&(this.$element.trigger(t.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},i.prototype.next=function(){return this.sliding?void 0:this.slide("next")},i.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},i.prototype.slide=function(e,i){var o=this.$element.find(".item.active"),s=i||o[e](),n=this.interval,r="next"==e?"left":"right",a="next"==e?"first":"last",l=this;if(!s.length){if(!this.options.wrap)return;s=this.$element.find(".item")[a]()}if(s.hasClass("active"))return this.sliding=!1;var h=s[0],p=t.Event("slide.bs.carousel",{relatedTarget:h,direction:r});if(this.$element.trigger(p),!p.isDefaultPrevented()){if(this.sliding=!0,n&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var c=t(this.$indicators.children()[this.getItemIndex(s)]);c&&c.addClass("active")}var d=t.Event("slid.bs.carousel",{relatedTarget:h,direction:r});return t.support.transition&&this.$element.hasClass("slide")?(s.addClass(e),s[0].offsetWidth,o.addClass(r),s.addClass(r),o.one("bsTransitionEnd",function(){s.removeClass([e,r].join(" ")).addClass("active"),o.removeClass(["active",r].join(" ")),l.sliding=!1,setTimeout(function(){l.$element.trigger(d)},0)}).emulateTransitionEnd(1e3*o.css("transition-duration").slice(0,-1))):(o.removeClass("active"),s.addClass("active"),this.sliding=!1,this.$element.trigger(d)),n&&this.cycle(),this}};var o=t.fn.carousel;t.fn.carousel=e,t.fn.carousel.Constructor=i,t.fn.carousel.noConflict=function(){return t.fn.carousel=o,this},t(document).on("click.bs.carousel.data-api","[data-slide], [data-slide-to]",function(i){var o,s=t(this),n=t(s.attr("data-target")||(o=s.attr("href"))&&o.replace(/.*(?=#[^\s]+$)/,""));if(n.hasClass("carousel")){var r=t.extend({},n.data(),s.data()),a=s.attr("data-slide-to");a&&(r.interval=!1),e.call(n,r),a&&n.data("bs.carousel").to(a),i.preventDefault()}}),t(window).on("load",function(){t('[data-ride="carousel"]').each(function(){var i=t(this);e.call(i,i.data())})})}(jQuery),+function(t){"use strict";function e(e){e&&3===e.which||(t(s).remove(),t(n).each(function(){var o=i(t(this)),s={relatedTarget:this};o.hasClass("open")&&(o.trigger(e=t.Event("hide.bs.dropdown",s)),e.isDefaultPrevented()||o.removeClass("open").trigger("hidden.bs.dropdown",s))}))}function i(e){var i=e.attr("data-target");i||(i=e.attr("href"),i=i&&/#[A-Za-z]/.test(i)&&i.replace(/.*(?=#[^\s]*$)/,""));var o=i&&t(i);return o&&o.length?o:e.parent()}function o(e){return this.each(function(){var i=t(this),o=i.data("bs.dropdown");o||i.data("bs.dropdown",o=new r(this)),"string"==typeof e&&o[e].call(i)})}var s=".dropdown-backdrop",n='[data-toggle="dropdown"]',r=function(e){t(e).on("click.bs.dropdown",this.toggle)};r.VERSION="3.2.0",r.prototype.toggle=function(o){var s=t(this);if(!s.is(".disabled, :disabled")){var n=i(s),r=n.hasClass("open");if(e(),!r){"ontouchstart"in document.documentElement&&!n.closest(".navbar-nav").length&&t('
    ').insertAfter(t(this)).on("click",e);var a={relatedTarget:this};if(n.trigger(o=t.Event("show.bs.dropdown",a)),o.isDefaultPrevented())return;s.trigger("focus"),n.toggleClass("open").trigger("shown.bs.dropdown",a)}return!1}},r.prototype.keydown=function(e){if(/(38|40|27)/.test(e.keyCode)){var o=t(this);if(e.preventDefault(),e.stopPropagation(),!o.is(".disabled, :disabled")){var s=i(o),r=s.hasClass("open");if(!r||r&&27==e.keyCode)return 27==e.which&&s.find(n).trigger("focus"),o.trigger("click");var a=" li:not(.divider):visible a",l=s.find('[role="menu"]'+a+', [role="listbox"]'+a);if(l.length){var h=l.index(l.filter(":focus"));38==e.keyCode&&h>0&&h--,40==e.keyCode&&h').appendTo(this.$body),this.$element.on("click.dismiss.bs.modal",t.proxy(function(t){t.target===t.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus.call(this.$element[0]):this.hide.call(this))},this)),s&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!e)return;s?this.$backdrop.one("bsTransitionEnd",e).emulateTransitionEnd(150):e()}else if(!this.isShown&&this.$backdrop){this.$backdrop.removeClass("in");var n=function(){i.removeBackdrop(),e&&e()};t.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one("bsTransitionEnd",n).emulateTransitionEnd(150):n()}else e&&e()},i.prototype.checkScrollbar=function(){document.body.clientWidth>=window.innerWidth||(this.scrollbarWidth=this.scrollbarWidth||this.measureScrollbar())},i.prototype.setScrollbar=function(){var t=parseInt(this.$body.css("padding-right")||0,10);this.scrollbarWidth&&this.$body.css("padding-right",t+this.scrollbarWidth)},i.prototype.resetScrollbar=function(){this.$body.css("padding-right","")},i.prototype.measureScrollbar=function(){var t=document.createElement("div");t.className="modal-scrollbar-measure",this.$body.append(t);var e=t.offsetWidth-t.clientWidth;return this.$body[0].removeChild(t),e};var o=t.fn.modal;t.fn.modal=e,t.fn.modal.Constructor=i,t.fn.modal.noConflict=function(){return t.fn.modal=o,this},t(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(i){var o=t(this),s=o.attr("href"),n=t(o.attr("data-target")||s&&s.replace(/.*(?=#[^\s]+$)/,"")),r=n.data("bs.modal")?"toggle":t.extend({remote:!/#/.test(s)&&s},n.data(),o.data());o.is("a")&&i.preventDefault(),n.one("show.bs.modal",function(t){t.isDefaultPrevented()||n.one("hidden.bs.modal",function(){o.is(":visible")&&o.trigger("focus")})}),e.call(n,r,this)})}(jQuery),+function(t){"use strict";function e(e){return this.each(function(){var o=t(this),s=o.data("bs.tooltip"),n="object"==typeof e&&e;(s||"destroy"!=e)&&(s||o.data("bs.tooltip",s=new i(this,n)),"string"==typeof e&&s[e]())})}var i=function(t,e){this.type=this.options=this.enabled=this.timeout=this.hoverState=this.$element=null,this.init("tooltip",t,e)};i.VERSION="3.2.0",i.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0}},i.prototype.init=function(e,i,o){this.enabled=!0,this.type=e,this.$element=t(i),this.options=this.getOptions(o),this.$viewport=this.options.viewport&&t(this.options.viewport.selector||this.options.viewport);for(var s=this.options.trigger.split(" "),n=s.length;n--;){var r=s[n];if("click"==r)this.$element.on("click."+this.type,this.options.selector,t.proxy(this.toggle,this));else if("manual"!=r){var a="hover"==r?"mouseenter":"focusin",l="hover"==r?"mouseleave":"focusout";this.$element.on(a+"."+this.type,this.options.selector,t.proxy(this.enter,this)),this.$element.on(l+"."+this.type,this.options.selector,t.proxy(this.leave,this))}}this.options.selector?this._options=t.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},i.prototype.getDefaults=function(){return i.DEFAULTS},i.prototype.getOptions=function(e){return e=t.extend({},this.getDefaults(),this.$element.data(),e),e.delay&&"number"==typeof e.delay&&(e.delay={show:e.delay,hide:e.delay}),e},i.prototype.getDelegateOptions=function(){var e={},i=this.getDefaults();return this._options&&t.each(this._options,function(t,o){i[t]!=o&&(e[t]=o)}),e},i.prototype.enter=function(e){var i=e instanceof this.constructor?e:t(e.currentTarget).data("bs."+this.type);return i||(i=new this.constructor(e.currentTarget,this.getDelegateOptions()),t(e.currentTarget).data("bs."+this.type,i)),clearTimeout(i.timeout),i.hoverState="in",i.options.delay&&i.options.delay.show?void(i.timeout=setTimeout(function(){"in"==i.hoverState&&i.show()},i.options.delay.show)):i.show()},i.prototype.leave=function(e){var i=e instanceof this.constructor?e:t(e.currentTarget).data("bs."+this.type);return i||(i=new this.constructor(e.currentTarget,this.getDelegateOptions()),t(e.currentTarget).data("bs."+this.type,i)),clearTimeout(i.timeout),i.hoverState="out",i.options.delay&&i.options.delay.hide?void(i.timeout=setTimeout(function(){"out"==i.hoverState&&i.hide()},i.options.delay.hide)):i.hide()},i.prototype.show=function(){var e=t.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(e);var i=t.contains(document.documentElement,this.$element[0]);if(e.isDefaultPrevented()||!i)return;var o=this,s=this.tip(),n=this.getUID(this.type);this.setContent(),s.attr("id",n),this.$element.attr("aria-describedby",n),this.options.animation&&s.addClass("fade");var r="function"==typeof this.options.placement?this.options.placement.call(this,s[0],this.$element[0]):this.options.placement,a=/\s?auto?\s?/i,l=a.test(r);l&&(r=r.replace(a,"")||"top"),s.detach().css({top:0,left:0,display:"block"}).addClass(r).data("bs."+this.type,this),this.options.container?s.appendTo(this.options.container):s.insertAfter(this.$element);var h=this.getPosition(),p=s[0].offsetWidth,c=s[0].offsetHeight;if(l){var d=r,f=this.$element.parent(),u=this.getPosition(f);r="bottom"==r&&h.top+h.height+c-u.scroll>u.height?"top":"top"==r&&h.top-u.scroll-c<0?"bottom":"right"==r&&h.right+p>u.width?"left":"left"==r&&h.left-pr.top+r.height&&(s.top=r.top+r.height-l)}else{var h=e.left-n,p=e.left+n+i;hr.width&&(s.left=r.left+r.width-p)}return s},i.prototype.getTitle=function(){var t,e=this.$element,i=this.options;return t=e.attr("data-original-title")||("function"==typeof i.title?i.title.call(e[0]):i.title)},i.prototype.getUID=function(t){do t+=~~(1e6*Math.random());while(document.getElementById(t));return t},i.prototype.tip=function(){return this.$tip=this.$tip||t(this.options.template)},i.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},i.prototype.validate=function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},i.prototype.enable=function(){this.enabled=!0},i.prototype.disable=function(){this.enabled=!1},i.prototype.toggleEnabled=function(){this.enabled=!this.enabled},i.prototype.toggle=function(e){var i=this;e&&(i=t(e.currentTarget).data("bs."+this.type),i||(i=new this.constructor(e.currentTarget,this.getDelegateOptions()),t(e.currentTarget).data("bs."+this.type,i))),i.tip().hasClass("in")?i.leave(i):i.enter(i)},i.prototype.destroy=function(){clearTimeout(this.timeout),this.hide().$element.off("."+this.type).removeData("bs."+this.type)};var o=t.fn.tooltip;t.fn.tooltip=e,t.fn.tooltip.Constructor=i,t.fn.tooltip.noConflict=function(){return t.fn.tooltip=o,this}}(jQuery),+function(t){"use strict";function e(e){return this.each(function(){var o=t(this),s=o.data("bs.popover"),n="object"==typeof e&&e;(s||"destroy"!=e)&&(s||o.data("bs.popover",s=new i(this,n)),"string"==typeof e&&s[e]())})}var i=function(t,e){this.init("popover",t,e)};if(!t.fn.tooltip)throw new Error("Popover requires tooltip.js");i.VERSION="3.2.0",i.DEFAULTS=t.extend({},t.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:''}),i.prototype=t.extend({},t.fn.tooltip.Constructor.prototype),i.prototype.constructor=i,i.prototype.getDefaults=function(){return i.DEFAULTS},i.prototype.setContent=function(){var t=this.tip(),e=this.getTitle(),i=this.getContent();t.find(".popover-title")[this.options.html?"html":"text"](e),t.find(".popover-content").empty()[this.options.html?"string"==typeof i?"html":"append":"text"](i),t.removeClass("fade top bottom left right in"),t.find(".popover-title").html()||t.find(".popover-title").hide()},i.prototype.hasContent=function(){return this.getTitle()||this.getContent()},i.prototype.getContent=function(){var t=this.$element,e=this.options;return t.attr("data-content")||("function"==typeof e.content?e.content.call(t[0]):e.content)},i.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")},i.prototype.tip=function(){return this.$tip||(this.$tip=t(this.options.template)),this.$tip};var o=t.fn.popover;t.fn.popover=e,t.fn.popover.Constructor=i,t.fn.popover.noConflict=function(){return t.fn.popover=o,this}}(jQuery),+function(t){"use strict";function e(e){return this.each(function(){var o=t(this),s=o.data("bs.tab");s||o.data("bs.tab",s=new i(this)),"string"==typeof e&&s[e]()})}var i=function(e){this.element=t(e)};i.VERSION="3.2.0",i.prototype.show=function(){var e=this.element,i=e.closest("ul:not(.dropdown-menu)"),o=e.data("target");if(o||(o=e.attr("href"),o=o&&o.replace(/.*(?=#[^\s]*$)/,"")),!e.parent("li").hasClass("active")){var s=i.find(".active:last a")[0],n=t.Event("show.bs.tab",{relatedTarget:s});if(e.trigger(n),!n.isDefaultPrevented()){var r=t(o);this.activate(e.closest("li"),i),this.activate(r,r.parent(),function(){e.trigger({type:"shown.bs.tab",relatedTarget:s})})}}},i.prototype.activate=function(e,i,o){function s(){n.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),e.addClass("active"),r?(e[0].offsetWidth,e.addClass("in")):e.removeClass("fade"),e.parent(".dropdown-menu")&&e.closest("li.dropdown").addClass("active"),o&&o()}var n=i.find("> .active"),r=o&&t.support.transition&&n.hasClass("fade");r?n.one("bsTransitionEnd",s).emulateTransitionEnd(150):s(),n.removeClass("in")};var o=t.fn.tab;t.fn.tab=e,t.fn.tab.Constructor=i,t.fn.tab.noConflict=function(){return t.fn.tab=o,this},t(document).on("click.bs.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(i){i.preventDefault(),e.call(t(this),"show")})}(jQuery),+function(t){"use strict";function e(e){return this.each(function(){var o=t(this),s=o.data("bs.affix"),n="object"==typeof e&&e;s||o.data("bs.affix",s=new i(this,n)),"string"==typeof e&&s[e]()})}var i=function(e,o){this.options=t.extend({},i.DEFAULTS,o),this.$target=t(this.options.target).on("scroll.bs.affix.data-api",t.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",t.proxy(this.checkPositionWithEventLoop,this)),this.$element=t(e),this.affixed=this.unpin=this.pinnedOffset=null,this.checkPosition()};i.VERSION="3.2.0",i.RESET="affix affix-top affix-bottom",i.DEFAULTS={offset:0,target:window},i.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(i.RESET).addClass("affix");var t=this.$target.scrollTop(),e=this.$element.offset();return this.pinnedOffset=e.top-t},i.prototype.checkPositionWithEventLoop=function(){setTimeout(t.proxy(this.checkPosition,this),1)},i.prototype.checkPosition=function(){if(this.$element.is(":visible")){var e=t(document).height(),o=this.$target.scrollTop(),s=this.$element.offset(),n=this.options.offset,r=n.top,a=n.bottom;"object"!=typeof n&&(a=r=n),"function"==typeof r&&(r=n.top(this.$element)),"function"==typeof a&&(a=n.bottom(this.$element));var l=null!=this.unpin&&o+this.unpin<=s.top?!1:null!=a&&s.top+this.$element.height()>=e-a?"bottom":null!=r&&r>=o?"top":!1;if(this.affixed!==l){null!=this.unpin&&this.$element.css("top","");var h="affix"+(l?"-"+l:""),p=t.Event(h+".bs.affix");this.$element.trigger(p),p.isDefaultPrevented()||(this.affixed=l,this.unpin="bottom"==l?this.getPinnedOffset():null,this.$element.removeClass(i.RESET).addClass(h).trigger(t.Event(h.replace("affix","affixed"))),"bottom"==l&&this.$element.offset({top:e-this.$element.height()-a}))}}};var o=t.fn.affix;t.fn.affix=e,t.fn.affix.Constructor=i,t.fn.affix.noConflict=function(){return t.fn.affix=o,this},t(window).on("load",function(){t('[data-spy="affix"]').each(function(){var i=t(this),o=i.data();o.offset=o.offset||{},o.offsetBottom&&(o.offset.bottom=o.offsetBottom),o.offsetTop&&(o.offset.top=o.offsetTop),e.call(i,o)})})}(jQuery),+function(t){"use strict";function e(e){return this.each(function(){var o=t(this),s=o.data("bs.collapse"),n=t.extend({},i.DEFAULTS,o.data(),"object"==typeof e&&e);!s&&n.toggle&&"show"==e&&(e=!e),s||o.data("bs.collapse",s=new i(this,n)),"string"==typeof e&&s[e]()})}var i=function(e,o){this.$element=t(e),this.options=t.extend({},i.DEFAULTS,o),this.transitioning=null,this.options.parent&&(this.$parent=t(this.options.parent)),this.options.toggle&&this.toggle()};i.VERSION="3.2.0",i.DEFAULTS={toggle:!0},i.prototype.dimension=function(){var t=this.$element.hasClass("width");return t?"width":"height"},i.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var i=t.Event("show.bs.collapse");if(this.$element.trigger(i),!i.isDefaultPrevented()){var o=this.$parent&&this.$parent.find("> .panel > .in");if(o&&o.length){var s=o.data("bs.collapse");if(s&&s.transitioning)return;e.call(o,"hide"),s||o.data("bs.collapse",null)}var n=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[n](0),this.transitioning=1;var r=function(){this.$element.removeClass("collapsing").addClass("collapse in")[n](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!t.support.transition)return r.call(this);var a=t.camelCase(["scroll",n].join("-"));this.$element.one("bsTransitionEnd",t.proxy(r,this)).emulateTransitionEnd(350)[n](this.$element[0][a])}}},i.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var e=t.Event("hide.bs.collapse");if(this.$element.trigger(e),!e.isDefaultPrevented()){var i=this.dimension();this.$element[i](this.$element[i]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse").removeClass("in"),this.transitioning=1;var o=function(){this.transitioning=0,this.$element.trigger("hidden.bs.collapse").removeClass("collapsing").addClass("collapse")};return t.support.transition?void this.$element[i](0).one("bsTransitionEnd",t.proxy(o,this)).emulateTransitionEnd(350):o.call(this)}}},i.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()};var o=t.fn.collapse;t.fn.collapse=e,t.fn.collapse.Constructor=i,t.fn.collapse.noConflict=function(){return t.fn.collapse=o,this},t(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(i){var o,s=t(this),n=s.attr("data-target")||i.preventDefault()||(o=s.attr("href"))&&o.replace(/.*(?=#[^\s]+$)/,""),r=t(n),a=r.data("bs.collapse"),l=a?"toggle":s.data(),h=s.attr("data-parent"),p=h&&t(h);a&&a.transitioning||(p&&p.find('[data-toggle="collapse"][data-parent="'+h+'"]').not(s).addClass("collapsed"),s[r.hasClass("in")?"addClass":"removeClass"]("collapsed")),e.call(r,l)})}(jQuery),+function(t){"use strict";function e(i,o){var s=t.proxy(this.process,this);this.$body=t("body"),this.$scrollElement=t(t(i).is("body")?window:i),this.options=t.extend({},e.DEFAULTS,o),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",s),this.refresh(),this.process()}function i(i){return this.each(function(){var o=t(this),s=o.data("bs.scrollspy"),n="object"==typeof i&&i;s||o.data("bs.scrollspy",s=new e(this,n)),"string"==typeof i&&s[i]()})}e.VERSION="3.2.0",e.DEFAULTS={offset:10},e.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},e.prototype.refresh=function(){var e="offset",i=0;t.isWindow(this.$scrollElement[0])||(e="position",i=this.$scrollElement.scrollTop()),this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight();var o=this;this.$body.find(this.selector).map(function(){var o=t(this),s=o.data("target")||o.attr("href"),n=/^#./.test(s)&&t(s);return n&&n.length&&n.is(":visible")&&[[n[e]().top+i,s]]||null}).sort(function(t,e){return t[0]-e[0]}).each(function(){o.offsets.push(this[0]),o.targets.push(this[1])})},e.prototype.process=function(){var t,e=this.$scrollElement.scrollTop()+this.options.offset,i=this.getScrollHeight(),o=this.options.offset+i-this.$scrollElement.height(),s=this.offsets,n=this.targets,r=this.activeTarget;if(this.scrollHeight!=i&&this.refresh(),e>=o)return r!=(t=n[n.length-1])&&this.activate(t);if(r&&e<=s[0])return r!=(t=n[0])&&this.activate(t);for(t=s.length;t--;)r!=n[t]&&e>=s[t]&&(!s[t+1]||e<=s[t+1])&&this.activate(n[t])},e.prototype.activate=function(e){this.activeTarget=e,t(this.selector).parentsUntil(this.options.target,".active").removeClass("active");var i=this.selector+'[data-target="'+e+'"],'+this.selector+'[href="'+e+'"]',o=t(i).parents("li").addClass("active");o.parent(".dropdown-menu").length&&(o=o.closest("li.dropdown").addClass("active")),o.trigger("activate.bs.scrollspy")};var o=t.fn.scrollspy;t.fn.scrollspy=i,t.fn.scrollspy.Constructor=e,t.fn.scrollspy.noConflict=function(){return t.fn.scrollspy=o,this},t(window).on("load.bs.scrollspy.data-api",function(){t('[data-spy="scroll"]').each(function(){var e=t(this);i.call(e,e.data())})})}(jQuery),+function(t){"use strict";function e(){var t=document.createElement("bootstrap"),e={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var i in e)if(void 0!==t.style[i])return{end:e[i]};return!1}t.fn.emulateTransitionEnd=function(e){var i=!1,o=this;t(this).one("bsTransitionEnd",function(){i=!0});var s=function(){i||t(o).trigger(t.support.transition.end)};return setTimeout(s,e),this},t(function(){t.support.transition=e(),t.support.transition&&(t.event.special.bsTransitionEnd={bindType:t.support.transition.end,delegateType:t.support.transition.end,handle:function(e){return t(e.target).is(this)?e.handleObj.handler.apply(this,arguments):void 0}})})}(jQuery);
\ No newline at end of file
++function(a){"use strict";var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype.close=function(b){function f(){e.trigger("closed.bs.alert").remove()}var c=a(this),d=c.attr("data-target");d||(d=c.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,""));var e=a(d);b&&b.preventDefault(),e.length||(e=c.hasClass("alert")?c:c.parent()),e.trigger(b=a.Event("close.bs.alert"));if(b.isDefaultPrevented())return;e.removeClass("in"),a.support.transition&&e.hasClass("fade")?e.one(a.support.transition.end,f).emulateTransitionEnd(150):f()};var d=a.fn.alert;a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("bs.alert");e||d.data("bs.alert",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.alert.Constructor=c,a.fn.alert.noConflict=function(){return a.fn.alert=d,this},a(document).on("click.bs.alert.data-api",b,c.prototype.close)}(jQuery),+function(a){"use strict";var b=function(c,d){this.$element=a(c),this.options=a.extend({},b.DEFAULTS,d),this.isLoading=!1};b.DEFAULTS={loadingText:"loading..."},b.prototype.setState=function(b){var c="disabled",d=this.$element,e=d.is("input")?"val":"html",f=d.data();b+="Text",f.resetText||d.data("resetText",d[e]()),d[e](f[b]||this.options[b]),setTimeout(a.proxy(function(){b=="loadingText"?(this.isLoading=!0,d.addClass(c).attr(c,c)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c))},this),0)},b.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle="buttons"]');if(b.length){var c=this.$element.find("input");c.prop("type")=="radio"&&(c.prop("checked")&&this.$element.hasClass("active")?a=!1:b.find(".active").removeClass("active")),a&&c.prop("checked",!this.$element.hasClass("active")).trigger("change")}a&&this.$element.toggleClass("active")};var c=a.fn.button;a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("bs.button"),f=typeof c=="object"&&c;e||d.data("bs.button",e=new b(this,f)),c=="toggle"?e.toggle():c&&e.setState(c)})},a.fn.button.Constructor=b,a.fn.button.noConflict=function(){return a.fn.button=c,this},a(document).on("click.bs.button.data-api","[data-toggle^=button]",function(b){var c=a(b.target);c.hasClass("btn")||(c=c.closest(".btn")),c.button("toggle"),b.preventDefault()})}(jQuery),+function(a){"use strict";var b=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=this.sliding=this.interval=this.$active=this.$items=null,this.options.pause=="hover"&&this.$element.on("mouseenter",a.proxy(this.pause,this)).on("mouseleave",a.proxy(this.cycle,this))};b.DEFAULTS={interval:5e3,pause:"hover",wrap:!0},b.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},b.prototype.getActiveIndex=function(){return this.$active=this.$element.find(".item.active"),this.$items=this.$active.parent().children(),this.$items.index(this.$active)},b.prototype.to=function(b){var c=this,d=this.getActiveIndex();if(b>this.$items.length-1||b<0)return;return this.sliding?this.$element.one("slid.bs.carousel",function(){c.to(b)}):d==b?this.pause().cycle():this.slide(b>d?"next":"prev",a(this.$items[b]))},b.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},b.prototype.next=function(){if(this.sliding)return;return this.slide("next")},b.prototype.prev=function(){if(this.sliding)return;return this.slide("prev")},b.prototype.slide=function(b,c){var d=this.$element.find(".item.active"),e=c||d[b](),f=this.interval,g=b=="next"?"left":"right",h=b=="next"?"first":"last",i=this;if(!e.length){if(!this.options.wrap)return;e=this.$element.find(".item")[h]()}if(e.hasClass("active"))return this.sliding=!1;var j=a.Event("slide.bs.carousel",{relatedTarget:e[0],direction:g});this.$element.trigger(j);if(j.isDefaultPrevented())return;return this.sliding=!0,f&&this.pause(),this.$indicators.length&&(this.$indicators.find(".active").removeClass("active"),this.$element.one("slid.bs.carousel",function(){var b=a(i.$indicators.children()[i.getActiveIndex()]);b&&b.addClass("active")})),a.support.transition&&this.$element.hasClass("slide")?(e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),d.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid.bs.carousel")},0)}).emulateTransitionEnd(d.css("transition-duration").slice(0,-1)*1e3)):(d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid.bs.carousel")),f&&this.cycle(),this};var c=a.fn.carousel;a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},b.DEFAULTS,d.data(),typeof c=="object"&&c),g=typeof c=="string"?c:f.slide;e||d.data("bs.carousel",e=new b(this,f)),typeof c=="number"?e.to(c):g?e[g]():f.interval&&e.pause().cycle()})},a.fn.carousel.Constructor=b,a.fn.carousel.noConflict=function(){return a.fn.carousel=c,this},a(document).on("click.bs.carousel.data-api","[data-slide], [data-slide-to]",function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=a.extend({},e.data(),c.data()),g=c.attr("data-slide-to");g&&(f.interval=!1),e.carousel(f),(g=c.attr("data-slide-to"))&&e.data("bs.carousel").to(g),b.preventDefault()}),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var b=a(this);b.carousel(b.data())})})}(jQuery),+function(a){function e(d){a(b).remove(),a(c).each(function(){var b=f(a(this)),c={relatedTarget:this};if(!b.hasClass("open"))return;b.trigger(d=a.Event("hide.bs.dropdown",c));if(d.isDefaultPrevented())return;b.removeClass("open").trigger("hidden.bs.dropdown",c)})}function f(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}"use strict";var b=".dropdown-backdrop",c="[data-toggle=dropdown]",d=function(b){a(b).on("click.bs.dropdown",this.toggle)};d.prototype.toggle=function(b){var c=a(this);if(c.is(".disabled, :disabled"))return;var d=f(c),g=d.hasClass("open");e();if(!g){"ontouchstart"in document.documentElement&&!d.closest(".navbar-nav").length&&a('
    ').insertAfter(a(this)).on("click",e);var h={relatedTarget:this};d.trigger(b=a.Event("show.bs.dropdown",h));if(b.isDefaultPrevented())return;d.toggleClass("open").trigger("shown.bs.dropdown",h),c.focus()}return!1},d.prototype.keydown=function(b){if(!/(38|40|27)/.test(b.keyCode))return;var d=a(this);b.preventDefault(),b.stopPropagation();if(d.is(".disabled, :disabled"))return;var e=f(d),g=e.hasClass("open");if(!g||g&&b.keyCode==27)return b.which==27&&e.find(c).focus(),d.click();var h=" li:not(.divider):visible a",i=e.find("[role=menu]"+h+", [role=listbox]"+h);if(!i.length)return;var j=i.index(i.filter(":focus"));b.keyCode==38&&j>0&&j--,b.keyCode==40&&j').appendTo(document.body),this.$element.on("click.dismiss.bs.modal",a.proxy(function(a){if(a.target!==a.currentTarget)return;this.options.backdrop=="static"?this.$element[0].focus.call(this.$element[0]):this.hide.call(this)},this)),d&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in");if(!b)return;d?this.$backdrop.one(a.support.transition.end,b).emulateTransitionEnd(150):b()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(a.support.transition.end,b).emulateTransitionEnd(150):b()):b&&b()};var c=a.fn.modal;a.fn.modal=function(c,d){return this.each(function(){var e=a(this),f=e.data("bs.modal"),g=a.extend({},b.DEFAULTS,e.data(),typeof c=="object"&&c);f||e.data("bs.modal",f=new b(this,g)),typeof c=="string"?f[c](d):g.show&&f.show(d)})},a.fn.modal.Constructor=b,a.fn.modal.noConflict=function(){return a.fn.modal=c,this},a(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(b){var c=a(this),d=c.attr("href"),e=a(c.attr("data-target")||d&&d.replace(/.*(?=#[^\s]+$)/,"")),f=e.data("bs.modal")?"toggle":a.extend({remote:!/#/.test(d)&&d},e.data(),c.data());c.is("a")&&b.preventDefault(),e.modal(f,this).one("hide",function(){c.is(":visible")&&c.focus()})}),a(document).on("show.bs.modal",".modal",function(){a(document.body).addClass("modal-open")}).on("hidden.bs.modal",".modal",function(){a(document.body).removeClass("modal-open")})}(jQuery),+function(a){"use strict";var b=function(a,b){this.type=this.options=this.enabled=this.timeout=this.hoverState=this.$element=null,this.init("tooltip",a,b)};b.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'
    ',trigger:"hover focus",title:"",delay:0,html:!1,container:!1},b.prototype.init=function(b,c,d){this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d);var e=this.options.trigger.split(" ");for(var f=e.length;f--;){var g=e[f];if(g=="click")this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if(g!="manual"){var h=g=="hover"?"mouseenter":"focusin",i=g=="hover"?"mouseleave":"focusout";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},b.prototype.getDefaults=function(){return b.DEFAULTS},b.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&typeof b.delay=="number"&&(b.delay={show:b.delay,hide:b.delay}),b},b.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},b.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget)[this.type](this.getDelegateOptions()).data("bs."+this.type);clearTimeout(c.timeout),c.hoverState="in";if(!c.options.delay||!c.options.delay.show)return c.show();c.timeout=setTimeout(function(){c.hoverState=="in"&&c.show()},c.options.delay.show)},b.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget)[this.type](this.getDelegateOptions()).data("bs."+this.type);clearTimeout(c.timeout),c.hoverState="out";if(!c.options.delay||!c.options.delay.hide)return c.hide();c.timeout=setTimeout(function(){c.hoverState=="out"&&c.hide()},c.options.delay.hide)},b.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(b);if(b.isDefaultPrevented())return;var c=this,d=this.tip();this.setContent(),this.options.animation&&d.addClass("fade");var e=typeof this.options.placement=="function"?this.options.placement.call(this,d[0],this.$element[0]):this.options.placement,f=/\s?auto?\s?/i,g=f.test(e);g&&(e=e.replace(f,"")||"top"),d.detach().css({top:0,left:0,display:"block"}).addClass(e),this.options.container?d.appendTo(this.options.container):d.insertAfter(this.$element);var h=this.getPosition(),i=d[0].offsetWidth,j=d[0].offsetHeight;if(g){var k=this.$element.parent(),l=e,m=document.documentElement.scrollTop||document.body.scrollTop,n=this.options.container=="body"?window.innerWidth:k.outerWidth(),o=this.options.container=="body"?window.innerHeight:k.outerHeight(),p=this.options.container=="body"?0:k.offset().left;e=e=="bottom"&&h.top+h.height+j-m>o?"top":e=="top"&&h.top-m-j<0?"bottom":e=="right"&&h.right+i>n?"left":e=="left"&&h.left-i
    '}),b.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),b.prototype.constructor=b,b.prototype.getDefaults=function(){return b.DEFAULTS},b.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content")[this.options.html?typeof c=="string"?"html":"append":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},b.prototype.hasContent=function(){return this.getTitle()||this.getContent()},b.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||(typeof b.content=="function"?b.content.call(a[0]):b.content)},b.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")},b.prototype.tip=function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip};var c=a.fn.popover;a.fn.popover=function(c){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f=typeof c=="object"&&c;if(!e&&c=="destroy")return;e||d.data("bs.popover",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.popover.Constructor=b,a.fn.popover.noConflict=function(){return a.fn.popover=c,this}}(jQuery),+function(a){"use strict";var b=function(b){this.element=a(b)};b.prototype.show=function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.data("target");d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,""));if(b.parent("li").hasClass("active"))return;var e=c.find(".active:last a")[0],f=a.Event("show.bs.tab",{relatedTarget:e});b.trigger(f);if(f.isDefaultPrevented())return;var g=a(d);this.activate(b.parent("li"),c),this.activate(g,g.parent(),function(){b.trigger({type:"shown.bs.tab",relatedTarget:e})})},b.prototype.activate=function(b,c,d){function g(){e.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),f?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var e=c.find("> .active"),f=d&&a.support.transition&&e.hasClass("fade");f?e.one(a.support.transition.end,g).emulateTransitionEnd(150):g(),e.removeClass("in")};var c=a.fn.tab;a.fn.tab=function(c){return this.each(function(){var d=a(this),e=d.data("bs.tab");e||d.data("bs.tab",e=new b(this)),typeof c=="string"&&e[c]()})},a.fn.tab.Constructor=b,a.fn.tab.noConflict=function(){return a.fn.tab=c,this},a(document).on("click.bs.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(b){b.preventDefault(),a(this).tab("show")})}(jQuery),+function(a){"use strict";var b=function(c,d){this.$element=a(c),this.options=a.extend({},b.DEFAULTS,d),this.transitioning=null,this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.DEFAULTS={toggle:!0},b.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},b.prototype.show=function(){if(this.transitioning||this.$element.hasClass("in"))return;var b=a.Event("show.bs.collapse");this.$element.trigger(b);if(b.isDefaultPrevented())return;var c=this.$parent&&this.$parent.find("> .panel > .in");if(c&&c.length){var d=c.data("bs.collapse");if(d&&d.transitioning)return;c.collapse("hide"),d||c.data("bs.collapse",null)}var e=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[e](0),this.transitioning=1;var f=function(){this.$element.removeClass("collapsing").addClass("collapse in")[e]("auto"),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return f.call(this);var g=a.camelCase(["scroll",e].join("-"));this.$element.one(a.support.transition.end,a.proxy(f,this)).emulateTransitionEnd(350)[e](this.$element[0][g])},b.prototype.hide=function(){if(this.transitioning||!this.$element.hasClass("in"))return;var b=a.Event("hide.bs.collapse");this.$element.trigger(b);if(b.isDefaultPrevented())return;var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse").removeClass("in"),this.transitioning=1;var d=function(){this.transitioning=0,this.$element.trigger("hidden.bs.collapse").removeClass("collapsing").addClass("collapse")};if(!a.support.transition)return d.call(this);this.$element[c](0).one(a.support.transition.end,a.proxy(d,this)).emulateTransitionEnd(350)},b.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()};var c=a.fn.collapse;a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("bs.collapse"),f=a.extend({},b.DEFAULTS,d.data(),typeof c=="object"&&c);!e&&f.toggle&&c=="show"&&(c=!c),e||d.data("bs.collapse",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.collapse.Constructor=b,a.fn.collapse.noConflict=function(){return a.fn.collapse=c,this},a(document).on("click.bs.collapse.data-api","[data-toggle=collapse]",function(b){var c=a(this),d,e=c.attr("data-target")||b.preventDefault()||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""),f=a(e),g=f.data("bs.collapse"),h=g?"toggle":c.data(),i=c.attr("data-parent"),j=i&&a(i);if(!g||!g.transitioning)j&&j.find('[data-toggle=collapse][data-parent="'+i+'"]').not(c).addClass("collapsed"),c[f.hasClass("in")?"addClass":"removeClass"]("collapsed");f.collapse(h)})}(jQuery),+function(a){function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(a.style[c]!==undefined)return{end:b[c]};return!1}"use strict",a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one(a.support.transition.end,function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b()})}(jQuery)
\ No newline at end of file

From 5133d85b99b6609285d1a3142611fa11d30ad9f1 Mon Sep 17 00:00:00 2001
From: "alton.crossley" 
Date: Thu, 23 Apr 2015 14:35:15 -0600
Subject: [PATCH 197/329] adding windows batch file for console

---
 console.bat | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 console.bat

diff --git a/console.bat b/console.bat
new file mode 100644
index 00000000..391a2617
--- /dev/null
+++ b/console.bat
@@ -0,0 +1 @@
+@php console %*
\ No newline at end of file

From 21bf1045872f6636420bed6b2dcd70a9ed5be7a5 Mon Sep 17 00:00:00 2001
From: corpsee 
Date: Sat, 25 Apr 2015 09:54:08 +0600
Subject: [PATCH 198/329]  Separated strings for 'archived'/'archived_menu'

---
 PHPCI/Languages/lang.da.php | 1 +
 PHPCI/Languages/lang.de.php | 1 +
 PHPCI/Languages/lang.el.php | 1 +
 PHPCI/Languages/lang.en.php | 1 +
 PHPCI/Languages/lang.es.php | 1 +
 PHPCI/Languages/lang.fr.php | 1 +
 PHPCI/Languages/lang.it.php | 3 ++-
 PHPCI/Languages/lang.nl.php | 1 +
 PHPCI/Languages/lang.pl.php | 1 +
 PHPCI/Languages/lang.ru.php | 3 ++-
 PHPCI/Languages/lang.uk.php | 3 ++-
 PHPCI/View/layout.phtml     | 2 +-
 12 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/PHPCI/Languages/lang.da.php b/PHPCI/Languages/lang.da.php
index 20e403e1..72959d12 100644
--- a/PHPCI/Languages/lang.da.php
+++ b/PHPCI/Languages/lang.da.php
@@ -114,6 +114,7 @@ i din foretrukne hosting-platform.',
     'default_branch' => 'Default branch navn',
     'allow_public_status' => 'Tillad offentlig status-side og -billede for dette projekt?',
     'archived' => 'Archived',
+    'archived_menu' => 'Archived',
     'save_project' => 'Gem Projekt',
 
     'error_mercurial' => 'Mercurial repository-URL skal starte med http:// eller https://',
diff --git a/PHPCI/Languages/lang.de.php b/PHPCI/Languages/lang.de.php
index 8a08e37d..bfc7ae2d 100644
--- a/PHPCI/Languages/lang.de.php
+++ b/PHPCI/Languages/lang.de.php
@@ -115,6 +115,7 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab
     'default_branch' => 'Name des Standardbranches',
     'allow_public_status' => 'Öffentliche Statusseite und -bild für dieses Projekt einschalten?',
     'archived' => 'Archived',
+    'archived_menu' => 'Archived',
     'save_project' => 'Projekt speichern',
 
     'error_mercurial' => 'Mercurial Repository-URL muss mit http://, oder https:// beginnen',
diff --git a/PHPCI/Languages/lang.el.php b/PHPCI/Languages/lang.el.php
index cb7d169f..2d988ca0 100644
--- a/PHPCI/Languages/lang.el.php
+++ b/PHPCI/Languages/lang.el.php
@@ -115,6 +115,7 @@ PHPCI',
     'default_branch' => 'Προκαθορισμένο όνομα διακλάδωσης',
     'allow_public_status' => 'Ενεργοποίηση της σελίδας δημόσιας κατάστασης και την εικόνα για το έργο αυτό;',
     'archived' => 'Archived',
+    'archived_menu' => 'Archived',
     'save_project' => 'Αποθήκευση έργου',
 
     'error_mercurial' => 'Ο σύνδεσμος URL του ευμετάβλητου αποθετηρίου πρέπει να ξεκινάει με http:// ή https://',
diff --git a/PHPCI/Languages/lang.en.php b/PHPCI/Languages/lang.en.php
index d6c48754..b0a0660e 100644
--- a/PHPCI/Languages/lang.en.php
+++ b/PHPCI/Languages/lang.en.php
@@ -116,6 +116,7 @@ PHPCI',
     'default_branch' => 'Default branch name',
     'allow_public_status' => 'Enable public status page and image for this project?',
     'archived' => 'Archived',
+    'archived_menu' => 'Archived',
     'save_project' => 'Save Project',
 
     'error_mercurial' => 'Mercurial repository URL must be start with http:// or https://',
diff --git a/PHPCI/Languages/lang.es.php b/PHPCI/Languages/lang.es.php
index 95a6eb73..1b7b33f7 100644
--- a/PHPCI/Languages/lang.es.php
+++ b/PHPCI/Languages/lang.es.php
@@ -115,6 +115,7 @@ PHPCI',
     'default_branch' => 'Nombre de la rama por defecto',
     'allow_public_status' => '¿Activar página pública con el estado del proyecto?',
     'archived' => 'Archivado',
+    'archived_menu' => 'Archivado',
     'save_project' => 'Guardar Proyecto',
 
     'error_mercurial' => 'La URL del repositorio de Mercurial debe comenzar con http:// or https://',
diff --git a/PHPCI/Languages/lang.fr.php b/PHPCI/Languages/lang.fr.php
index f1ad7129..dd3e6256 100644
--- a/PHPCI/Languages/lang.fr.php
+++ b/PHPCI/Languages/lang.fr.php
@@ -115,6 +115,7 @@ PHPCI',
     'default_branch' => 'Nom de la branche par défaut',
     'allow_public_status' => 'Activer la page de statut publique et l\'image pour ce projet ?',
     'archived' => 'Archived',
+    'archived_menu' => 'Archived',
     'save_project' => 'Enregistrer le projet',
 
     'error_mercurial' => 'Les URLs de dépôt Mercurial doivent commencer par http:// ou https://',
diff --git a/PHPCI/Languages/lang.it.php b/PHPCI/Languages/lang.it.php
index ff326d14..2c7bbea3 100644
--- a/PHPCI/Languages/lang.it.php
+++ b/PHPCI/Languages/lang.it.php
@@ -113,8 +113,9 @@ PHPCI',
                                 (se non puoi aggiungere il file phpci.yml nel repository di questo progetto)',
     'default_branch' => 'Nome del branch di default',
     'allow_public_status' => 'Vuoi rendere pubblica la pagina dello stato e l\'immagine per questo progetto?',
-    'save_project' => 'Salva il Progetto',
     'archived' => 'Archived',
+    'archived_menu' => 'Archived',
+    'save_project' => 'Salva il Progetto',
 
     'error_mercurial' => 'L\'URL del repository Mercurial URL deve iniziare con http:// o https://',
     'error_remote' => 'L\'URL del repository deve iniziare con git://, http:// o https://',
diff --git a/PHPCI/Languages/lang.nl.php b/PHPCI/Languages/lang.nl.php
index e0638aaf..1f46eb71 100644
--- a/PHPCI/Languages/lang.nl.php
+++ b/PHPCI/Languages/lang.nl.php
@@ -115,6 +115,7 @@ van je gekozen source code hosting platform',
     'default_branch' => 'Standaard branch naam',
     'allow_public_status' => 'Publieke statuspagina en afbeelding beschikbaar maken voor dit project?',
     'archived' => 'Archived',
+    'archived_menu' => 'Archived',
     'save_project' => 'Project opslaan',
 
     'error_mercurial' => 'Mercurial repository URL dient te starten met http:// of https://',
diff --git a/PHPCI/Languages/lang.pl.php b/PHPCI/Languages/lang.pl.php
index d6f95ad6..7e35056c 100644
--- a/PHPCI/Languages/lang.pl.php
+++ b/PHPCI/Languages/lang.pl.php
@@ -116,6 +116,7 @@ od wybranego kodu źródłowego platformy hostingowej.',
     'default_branch' => 'Domyślna nazwa gałęzi',
     'allow_public_status' => 'Włączyć status publiczny dla tego projektu?',
     'archived' => 'W archiwum',
+    'archived_menu' => 'W archiwum',
     'save_project' => 'Zachowaj Projekt',
 
     'error_mercurial' => 'URL repozytorium Mercurialnego powinno zaczynać się od http:// and https://',
diff --git a/PHPCI/Languages/lang.ru.php b/PHPCI/Languages/lang.ru.php
index aa0f40fb..68f52e16 100644
--- a/PHPCI/Languages/lang.ru.php
+++ b/PHPCI/Languages/lang.ru.php
@@ -113,7 +113,8 @@ PHPCI',
                                 (если вы не добавили файл phpci.yml в репозиторий вашего проекта)',
     'default_branch' => 'Ветка по умолчанию',
     'allow_public_status' => 'Разрешить публичный статус и изображение (статуса) для проекта',
-    'archived' => 'Запакован',
+    'archived' => 'Архивный',
+    'archived_menu' => 'Архив',
     'save_project' => 'Сохранить проект',
 
     'error_mercurial' => 'URL репозитория Mercurial должен начинаться с http:// или https://',
diff --git a/PHPCI/Languages/lang.uk.php b/PHPCI/Languages/lang.uk.php
index a3ca1b37..7071f059 100644
--- a/PHPCI/Languages/lang.uk.php
+++ b/PHPCI/Languages/lang.uk.php
@@ -113,7 +113,8 @@ PHPCI',
 (якщо ви не додали файл phpci.yml до репозиторію вашого проекту)',
     'default_branch' => 'Назва гілки за замовчуванням',
     'allow_public_status' => 'Увімкнути публічну сторінку статусу та зображення для цього проекта?',
-    'archived' => 'Archived',
+    'archived' => 'Архівний',
+    'archived_menu' => 'Архів',
     'save_project' => 'Зберегти проект',
 
     'error_mercurial' => 'URL репозиторію Mercurial повинен починатись із http:// або https://',
diff --git a/PHPCI/View/layout.phtml b/PHPCI/View/layout.phtml
index 82eabfe5..ca462475 100644
--- a/PHPCI/View/layout.phtml
+++ b/PHPCI/View/layout.phtml
@@ -240,7 +240,7 @@
 
                 
  • 
                     
-                         
+                         
                     
                 
    • 
 

From 590ab5fae580a59afc54d4fc1e8cd9cf9226e9f0 Mon Sep 17 00:00:00 2001
From: Adirelle 
Date: Thu, 23 Apr 2015 15:55:00 +0200
Subject: [PATCH 199/329] Build::removeBuildDirectory: do not try to remove
 build directory of not-yet-persisted builds.

---
 PHPCI/Model/Build.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/PHPCI/Model/Build.php b/PHPCI/Model/Build.php
index 2681498f..a0019438 100644
--- a/PHPCI/Model/Build.php
+++ b/PHPCI/Model/Build.php
@@ -221,10 +221,13 @@ class Build extends BuildBase
     /**
      * Return the path to run this build into.
      *
-     * @return string
+     * @return string|null
      */
     public function getBuildPath()
     {
+        if (!$this->getId()) {
+            return null;
+        }
         return PHPCI_BUILD_ROOT_DIR . $this->getId();
     }
 
@@ -235,7 +238,7 @@ class Build extends BuildBase
     {
         $buildPath = $this->getBuildPath();
 
-        if (!is_dir($buildPath)) {
+        if (!$buildPath || !is_dir($buildPath)) {
             return;
         }
 

From 5cd29ca7fca5981d5b6b9ce035657d0b7a05c38f Mon Sep 17 00:00:00 2001
From: Adirelle 
Date: Wed, 22 Apr 2015 13:24:00 +0200
Subject: [PATCH 200/329] Allow to specify a mail template ('short' or 'long')
 in phpci.yml.

Email plugin: checks if the custom template exists before trying to use it.

Closed #933
---
 PHPCI/Plugin/Email.php           | 50 +++++++++++++++++++++++++++++---
 PHPCI/View/Email/failed.phtml    | 15 ----------
 PHPCI/View/Email/layout.phtml    | 28 ++++++++++++++++++
 PHPCI/View/Email/long.phtml      |  2 ++
 PHPCI/View/Email/short.phtml     |  1 +
 PHPCI/View/Email/success.phtml   | 17 -----------
 Tests/PHPCI/Plugin/EmailTest.php |  2 +-
 7 files changed, 78 insertions(+), 37 deletions(-)
 delete mode 100644 PHPCI/View/Email/failed.phtml
 create mode 100644 PHPCI/View/Email/layout.phtml
 create mode 100644 PHPCI/View/Email/long.phtml
 create mode 100644 PHPCI/View/Email/short.phtml
 delete mode 100644 PHPCI/View/Email/success.phtml

diff --git a/PHPCI/Plugin/Email.php b/PHPCI/Plugin/Email.php
index 8414451f..c2638860 100644
--- a/PHPCI/Plugin/Email.php
+++ b/PHPCI/Plugin/Email.php
@@ -9,11 +9,13 @@
 
 namespace PHPCI\Plugin;
 
+use Exception;
 use b8\View;
 use PHPCI\Builder;
 use PHPCI\Helper\Lang;
 use PHPCI\Model\Build;
 use PHPCI\Helper\Email as EmailHelper;
+use Psr\Log\LogLevel;
 
 /**
 * Email Plugin - Provides simple email capability to PHPCI.
@@ -70,12 +72,25 @@ class Email implements \PHPCI\Plugin
 
         $buildStatus  = $this->build->isSuccessful() ? "Passing Build" : "Failing Build";
         $projectName  = $this->build->getProject()->getTitle();
-        $mailTemplate = $this->build->isSuccessful() ? 'Email/success' : 'Email/failed';
 
-        $view = new View($mailTemplate);
+        try {
+            $view = $this->getMailTemplate();
+        } catch (Exception $e) {
+            $this->phpci->log(
+                sprintf('Unknown mail template "%s", falling back to default.', $this->options['template']),
+                LogLevel::WARNING
+            );
+            $view = $this->getDefaultMailTemplate();
+        }
+
         $view->build = $this->build;
         $view->project = $this->build->getProject();
-        $body = $view->render();
+
+        $layout = new View('Email/layout');
+        $layout->build = $this->build;
+        $layout->project = $this->build->getProject();
+        $layout->content = $view->render();
+        $body = $layout->render();
 
         $sendFailures = $this->sendSeparateEmails(
             $addresses,
@@ -97,7 +112,7 @@ class Email implements \PHPCI\Plugin
      * @param string $body Email body
      * @return array                      Array of failed addresses
      */
-    public function sendEmail($toAddress, $ccList, $subject, $body)
+    protected function sendEmail($toAddress, $ccList, $subject, $body)
     {
         $email = new EmailHelper();
 
@@ -168,6 +183,7 @@ class Email implements \PHPCI\Plugin
 
     /**
      * Get the list of email addresses to CC.
+     *
      * @return array
      */
     protected function getCcAddresses()
@@ -182,4 +198,30 @@ class Email implements \PHPCI\Plugin
 
         return $ccAddresses;
     }
+
+    /**
+     * Get the mail template used to sent the mail.
+     *
+     * @return View
+     */
+    protected function getMailTemplate()
+    {
+        if (isset($this->options['template'])) {
+            return new View('Email/' . $this->options['template']);
+        }
+
+        return $this->getDefaultMailTemplate();
+    }
+
+    /**
+     * Get the default mail template.
+     *
+     * @return View
+     */
+    protected function getDefaultMailTemplate()
+    {
+        $template = $this->build->isSuccessful() ? 'short' : 'long';
+
+        return new View('Email/' . $template);
+    }
 }
diff --git a/PHPCI/View/Email/failed.phtml b/PHPCI/View/Email/failed.phtml
deleted file mode 100644
index 4391748f..00000000
--- a/PHPCI/View/Email/failed.phtml
+++ /dev/null
@@ -1,15 +0,0 @@
-
    
-    
    
-        
    
-            getTitle(); ?> - Build #getId(); ?>
-        
    
-
-        
    
-            
    Your commit getCommitId(); ?> caused a failed build in project getTitle(); ?>.
    
-
-            
    getCommitMessage(); ?>
    
-
-            
    Please review your commit and the build log.
    
-        
    
-    
    
-
    
\ No newline at end of file
diff --git a/PHPCI/View/Email/layout.phtml b/PHPCI/View/Email/layout.phtml
new file mode 100644
index 00000000..878a9c9e
--- /dev/null
+++ b/PHPCI/View/Email/layout.phtml
@@ -0,0 +1,28 @@
+
+    
+        
+    
+    
+        
    
+            
    
+                
    getTitle(); ?> - Build #getId(); ?>
    
+                
    
+                    
    
+                        Your commit getCommitId(); ?> generated a
+                        isSuccessful() ? 'successful' : 'failed'; ?> build in project
+                        getTitle(); ?>.
+                    
    
+                    
+                
    
+                
+            
    
+        
    
+    
+
diff --git a/PHPCI/View/Email/long.phtml b/PHPCI/View/Email/long.phtml
new file mode 100644
index 00000000..35464504
--- /dev/null
+++ b/PHPCI/View/Email/long.phtml
@@ -0,0 +1,2 @@
+
    getCommitMessage(); ?>
    
+
    getLog()); ?>
    
diff --git a/PHPCI/View/Email/short.phtml b/PHPCI/View/Email/short.phtml
new file mode 100644
index 00000000..75df4f83
--- /dev/null
+++ b/PHPCI/View/Email/short.phtml
@@ -0,0 +1 @@
+
    getCommitMessage(); ?>
    
diff --git a/PHPCI/View/Email/success.phtml b/PHPCI/View/Email/success.phtml
deleted file mode 100644
index 342e3483..00000000
--- a/PHPCI/View/Email/success.phtml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
    
-    
    
-        
    
-            getTitle(); ?> - Build #getId(); ?>
-        
    
-
-        
    
-            
    Your commit getCommitId(); ?> genrate a successfull build in project getTitle(); ?>.
    
-
-            
    getCommitMessage(); ?>
    
-            
    getLog()); ?>
    
-            
    You can review your commit and the build log.
    
-        
    
-    
    
-
    
diff --git a/Tests/PHPCI/Plugin/EmailTest.php b/Tests/PHPCI/Plugin/EmailTest.php
index 18eaf948..bb039ca4 100644
--- a/Tests/PHPCI/Plugin/EmailTest.php
+++ b/Tests/PHPCI/Plugin/EmailTest.php
@@ -349,7 +349,7 @@ class EmailTest extends \PHPUnit_Framework_TestCase
         $this->testedEmailPlugin->execute();
 
         $this->assertContains('Passing', $this->message['subject']);
-        $this->assertContains('successfull', $this->message['body']);
+        $this->assertContains('successful', $this->message['body']);
     }
 
     /**

From 8bf1d09afdf56c1557502e50b8291716f1cf4f96 Mon Sep 17 00:00:00 2001
From: Adirelle 
Date: Fri, 24 Apr 2015 11:32:13 +0200
Subject: [PATCH 201/329] Black-on-white color theme for the build log.

---
 public/assets/css/ansi-colors.css | 65 ++++++++++++++++---------------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/public/assets/css/ansi-colors.css b/public/assets/css/ansi-colors.css
index c3011299..47a14dbf 100644
--- a/public/assets/css/ansi-colors.css
+++ b/public/assets/css/ansi-colors.css
@@ -1,32 +1,33 @@
-.ansi_color_fg_black { color: black }
-.ansi_color_bg_black { background-color: black }
-.ansi_color_fg_red { color: darkred }
-.ansi_color_bg_red { background-color: darkred }
-.ansi_color_fg_green { color: green }
-.ansi_color_bg_green { background-color: green }
-.ansi_color_fg_yellow { color: yellow }
-.ansi_color_bg_yellow { background-color: yellow }
-.ansi_color_fg_blue { color: blue }
-.ansi_color_bg_blue { background-color: blue }
-.ansi_color_fg_magenta { color: darkmagenta }
-.ansi_color_bg_magenta { background-color: darkmagenta }
-.ansi_color_fg_cyan { color: cyan }
-.ansi_color_bg_cyan { background-color: cyan }
-.ansi_color_fg_white { color: white }
-.ansi_color_bg_white { background-color: white }
-.ansi_color_fg_brblack { color: black }
-.ansi_color_bg_brblack { background-color: black }
-.ansi_color_fg_brred { color: red }
-.ansi_color_bg_brred { background-color: red }
-.ansi_color_fg_brgreen { color: lightgreen }
-.ansi_color_bg_brgreen { background-color: lightgreen }
-.ansi_color_fg_bryellow { color: lightyellow }
-.ansi_color_bg_bryellow { background-color: lightyellow }
-.ansi_color_fg_brblue { color: lightblue }
-.ansi_color_bg_brblue { background-color: lightblue }
-.ansi_color_fg_brmagenta { color: magenta }
-.ansi_color_bg_brmagenta { background-color: magenta }
-.ansi_color_fg_brcyan { color: lightcyan }
-.ansi_color_bg_brcyan { background-color: lightcyan }
-.ansi_color_fg_brwhite { color: white }
-.ansi_color_bg_brwhite { background-color: white }
+.ansi_color_bg_black     { background-color: #FFF }
+.ansi_color_bg_red       { background-color: #900 }
+.ansi_color_bg_green     { background-color: #090 }
+.ansi_color_bg_yellow    { background-color: #990 }
+.ansi_color_bg_blue      { background-color: #009 }
+.ansi_color_bg_magenta   { background-color: #909 }
+.ansi_color_bg_cyan      { background-color: #099 }
+.ansi_color_bg_white     { background-color: #000 }
+.ansi_color_bg_brblack   { background-color: #FFF }
+.ansi_color_bg_brred     { background-color: #F00 }
+.ansi_color_bg_brgreen   { background-color: #0F0 }
+.ansi_color_bg_bryellow  { background-color: #FF0 }
+.ansi_color_bg_brblue    { background-color: #00F }
+.ansi_color_bg_brmagenta { background-color: #F0F }
+.ansi_color_bg_brcyan    { background-color: #0FF }
+.ansi_color_bg_brwhite   { background-color: #000 }
+
+.ansi_color_fg_black     { color: #FFF }
+.ansi_color_fg_red       { color: #900 }
+.ansi_color_fg_green     { color: #090 }
+.ansi_color_fg_yellow    { color: #990 }
+.ansi_color_fg_blue      { color: #009 }
+.ansi_color_fg_magenta   { color: #909 }
+.ansi_color_fg_cyan      { color: #099 }
+.ansi_color_fg_white     { color: #000 }
+.ansi_color_fg_brblack   { color: #FFF }
+.ansi_color_fg_brred     { color: #F00 }
+.ansi_color_fg_brgreen   { color: #0F0 }
+.ansi_color_fg_bryellow  { color: #FF0 }
+.ansi_color_fg_brblue    { color: #00F }
+.ansi_color_fg_brmagenta { color: #F0F }
+.ansi_color_fg_brcyan    { color: #0FF }
+.ansi_color_fg_brwhite   { color: #000 }

From 0887bd4bc4b1a74440a98b9c3667cc2a56eba0ad Mon Sep 17 00:00:00 2001
From: Victor 
Date: Wed, 6 May 2015 23:44:55 +0300
Subject: [PATCH 202/329] Fix for strict standards issue in RebuildCommand.php

[ErrorException]
Runtime Notice: Only variables should be passed by reference in /var/www/phpci/PHPCI/Command/RebuildCommand.php line 78
---
 PHPCI/Command/RebuildCommand.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/PHPCI/Command/RebuildCommand.php b/PHPCI/Command/RebuildCommand.php
index 165d94c7..4c24b359 100644
--- a/PHPCI/Command/RebuildCommand.php
+++ b/PHPCI/Command/RebuildCommand.php
@@ -75,7 +75,8 @@ class RebuildCommand extends Command
         $store = Factory::getStore('Build');
         $service = new BuildService($store);
 
-        $lastBuild = array_shift($store->getLatestBuilds(null, 1));
+        $builds = $store->getLatestBuilds(null, 1);
+        $lastBuild = array_shift($builds);
         $service->createDuplicateBuild($lastBuild);
 
         $runner->run(new ArgvInput(array()), $output);

From 1c864cebedc6ae5850930caf531bc5202bd2db82 Mon Sep 17 00:00:00 2001
From: corpsee 
Date: Sat, 23 May 2015 15:40:49 +0600
Subject: [PATCH 203/329] Fixed TapParser parse fail with valid data + added
 tests

---
 PHPCI/Plugin/Util/TapParser.php           | 13 ++++----
 Tests/PHPCI/Plugin/Util/TapParserTest.php | 36 +++++++++++++++++++++++
 2 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/PHPCI/Plugin/Util/TapParser.php b/PHPCI/Plugin/Util/TapParser.php
index 18772a6a..132c5cce 100644
--- a/PHPCI/Plugin/Util/TapParser.php
+++ b/PHPCI/Plugin/Util/TapParser.php
@@ -13,9 +13,10 @@ use Symfony\Component\Yaml\Yaml;
 class TapParser
 {
     const TEST_COUNTS_PATTERN = '/^\d+\.\.(\d+)/';
-    const TEST_LINE_PATTERN = '/^(ok|not ok)(?:\s+\d+)?(?:\s+\-)?\s*(.*?)(?:\s*#\s*(skip|todo)\s*(.*))?\s*$/i';
-    const TEST_YAML_START = '/^(\s*)---/';
-    const TEST_DIAGNOSTIC = '/^#/';
+    const TEST_LINE_PATTERN   = '/^(ok|not ok)(?:\s+\d+)?(?:\s+\-)?\s*(.*?)(?:\s*#\s*(skip|todo)\s*(.*))?\s*$/i';
+    const TEST_YAML_START     = '/^(\s*)---/';
+    const TEST_DIAGNOSTIC     = '/^#/';
+    const TEST_COVERAGE       = '/^Generating/';
 
     /**
      * @var string
@@ -81,7 +82,7 @@ class TapParser
             $line = $this->nextLine();
         }
 
-        if (count($this->results) !== $this->testCount) {
+        if (false !== $this->testCount && count($this->results) !== $this->testCount) {
             throw new Exception(Lang::get('tap_error'));
         }
 
@@ -126,13 +127,15 @@ class TapParser
     /** Parse a single line.
      *
      * @param string $line
+     *
+     * @throws Exception
      */
     protected function parseLine($line)
     {
         if (preg_match(self::TEST_COUNTS_PATTERN, $line, $matches)) {
             $this->testCount = intval($matches[1]);
 
-        } elseif (preg_match(self::TEST_DIAGNOSTIC, $line)) {
+        } elseif (preg_match(self::TEST_DIAGNOSTIC, $line) || preg_match(self::TEST_COVERAGE, $line) || !$line) {
             return;
 
         } elseif (preg_match(self::TEST_LINE_PATTERN, $line, $matches)) {
diff --git a/Tests/PHPCI/Plugin/Util/TapParserTest.php b/Tests/PHPCI/Plugin/Util/TapParserTest.php
index 732a44a6..8d31d7c9 100644
--- a/Tests/PHPCI/Plugin/Util/TapParserTest.php
+++ b/Tests/PHPCI/Plugin/Util/TapParserTest.php
@@ -23,6 +23,28 @@ ok 1 - SomeTest::testAnother
 not ok
 1..2
 Trailing garbage !
+TAP;
+        $parser = new TapParser($content);
+        $result = $parser->parse();
+
+        $this->assertEquals(array(
+            array('pass' => true, 'severity' => 'success', 'message' => 'SomeTest::testAnother'),
+            array('pass' => false, 'severity' => 'fail', 'message' => ''),
+        ), $result);
+
+        $this->assertEquals(1, $parser->getTotalFailures());
+    }
+
+    public function testSimple2()
+    {
+        $content = <<parse();
@@ -48,6 +70,20 @@ TAP;
         $parser->parse();
     }
 
+    public function testTapCoverage()
+    {
+        $content = <<parse();
+
+        $this->assertEquals(array(), $result);
+    }
+
     /**
      * @expectedException \Exception
      * @expectedExceptionMessageRegExp /Duplicated TAP/

From c20ee0533bb1ba61573b04a442762b41ac046e11 Mon Sep 17 00:00:00 2001
From: corpsee 
Date: Sun, 24 May 2015 12:39:27 +0600
Subject: [PATCH 204/329] Fixed TapParser::parseLine Cyclomatic Complexity

---
 PHPCI/Plugin/Util/TapParser.php | 112 +++++++++++++++++++++++++-------
 1 file changed, 88 insertions(+), 24 deletions(-)

diff --git a/PHPCI/Plugin/Util/TapParser.php b/PHPCI/Plugin/Util/TapParser.php
index 132c5cce..25d3a2a5 100644
--- a/PHPCI/Plugin/Util/TapParser.php
+++ b/PHPCI/Plugin/Util/TapParser.php
@@ -124,6 +124,79 @@ class TapParser
         return false;
     }
 
+    /**
+     * @param string $line
+     *
+     * @return boolean
+     */
+    protected function testCountLine($line)
+    {
+        if (preg_match(self::TEST_COUNTS_PATTERN, $line, $matches)) {
+            $this->testCount = intval($matches[1]);
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param string $line
+     *
+     * @return boolean
+     */
+    protected function testLine($line)
+    {
+        if (preg_match(self::TEST_LINE_PATTERN, $line, $matches)) {
+            $this->results[] = $this->processTestLine(
+                $matches[1],
+                isset($matches[2]) ? $matches[2] : '',
+                isset($matches[3]) ? $matches[3] : null,
+                isset($matches[4]) ? $matches[4] : null
+            );
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param string $line
+     *
+     * @return boolean
+     */
+    protected function yamlLine($line)
+    {
+        if (preg_match(self::TEST_YAML_START, $line, $matches)) {
+            $diagnostic = $this->processYamlBlock($matches[1]);
+            $test       = array_pop($this->results);
+            if (isset($test['message'], $diagnostic['message'])) {
+                $test['message'] .= PHP_EOL . $diagnostic['message'];
+                unset($diagnostic['message']);
+            }
+            $this->results[] = array_replace($test, $diagnostic);
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param string $line
+     *
+     * @return boolean
+     */
+    protected function garbageLine($line)
+    {
+        if (preg_match(self::TEST_DIAGNOSTIC, $line) || preg_match(self::TEST_COVERAGE, $line) || !$line) {
+            return true;
+        }
+
+        return false;
+    }
+
     /** Parse a single line.
      *
      * @param string $line
@@ -132,32 +205,23 @@ class TapParser
      */
     protected function parseLine($line)
     {
-        if (preg_match(self::TEST_COUNTS_PATTERN, $line, $matches)) {
-            $this->testCount = intval($matches[1]);
-
-        } elseif (preg_match(self::TEST_DIAGNOSTIC, $line) || preg_match(self::TEST_COVERAGE, $line) || !$line) {
+        if ($this->garbageLine($line)) {
             return;
-
-        } elseif (preg_match(self::TEST_LINE_PATTERN, $line, $matches)) {
-            $this->results[] = $this->processTestLine(
-                $matches[1],
-                isset($matches[2]) ? $matches[2] : '',
-                isset($matches[3]) ? $matches[3] : null,
-                isset($matches[4]) ? $matches[4] : null
-            );
-
-        } elseif (preg_match(self::TEST_YAML_START, $line, $matches)) {
-            $diagnostic = $this->processYamlBlock($matches[1]);
-            $test = array_pop($this->results);
-            if (isset($test['message'], $diagnostic['message'])) {
-                $test['message'] .= PHP_EOL . $diagnostic['message'];
-                unset($diagnostic['message']);
-            }
-            $this->results[] = array_replace($test, $diagnostic);
-
-        } else {
-            throw new Exception(sprintf('Incorrect TAP data, line %d: %s', $this->lineNumber, $line));
         }
+
+        if ($this->testCountLine($line)) {
+            return;
+        }
+
+        if ($this->testLine($line)) {
+            return;
+        }
+
+        if ($this->yamlLine($line)) {
+            return;
+        }
+
+        throw new Exception(sprintf('Incorrect TAP data, line %d: %s', $this->lineNumber, $line));
     }
 
     /**

From 3f02e63c92bd99fe7990a6f9b2aa23f1b978d19b Mon Sep 17 00:00:00 2001
From: corpsee 
Date: Sun, 24 May 2015 12:43:43 +0600
Subject: [PATCH 205/329] Fixed TapParser::parseLine Cyclomatic Complexity

---
 PHPCI/Plugin/Util/TapParser.php | 36 ++++-----------------------------
 1 file changed, 4 insertions(+), 32 deletions(-)

diff --git a/PHPCI/Plugin/Util/TapParser.php b/PHPCI/Plugin/Util/TapParser.php
index 25d3a2a5..451b73f0 100644
--- a/PHPCI/Plugin/Util/TapParser.php
+++ b/PHPCI/Plugin/Util/TapParser.php
@@ -124,22 +124,6 @@ class TapParser
         return false;
     }
 
-    /**
-     * @param string $line
-     *
-     * @return boolean
-     */
-    protected function testCountLine($line)
-    {
-        if (preg_match(self::TEST_COUNTS_PATTERN, $line, $matches)) {
-            $this->testCount = intval($matches[1]);
-
-            return true;
-        }
-
-        return false;
-    }
-
     /**
      * @param string $line
      *
@@ -183,20 +167,6 @@ class TapParser
         return false;
     }
 
-    /**
-     * @param string $line
-     *
-     * @return boolean
-     */
-    protected function garbageLine($line)
-    {
-        if (preg_match(self::TEST_DIAGNOSTIC, $line) || preg_match(self::TEST_COVERAGE, $line) || !$line) {
-            return true;
-        }
-
-        return false;
-    }
-
     /** Parse a single line.
      *
      * @param string $line
@@ -205,11 +175,13 @@ class TapParser
      */
     protected function parseLine($line)
     {
-        if ($this->garbageLine($line)) {
+        if (preg_match(self::TEST_DIAGNOSTIC, $line) || preg_match(self::TEST_COVERAGE, $line) || !$line) {
             return;
         }
 
-        if ($this->testCountLine($line)) {
+        if (preg_match(self::TEST_COUNTS_PATTERN, $line, $matches)) {
+            $this->testCount = intval($matches[1]);
+
             return;
         }
 

From 853107027b64d260225b678cde45124b0ac0c544 Mon Sep 17 00:00:00 2001
From: corpsee 
Date: Sun, 24 May 2015 14:20:51 +0600
Subject: [PATCH 206/329] Fixed GithubBuild::getDiffLineNumber method for
 correct phpcpd work

---
 PHPCI/Model/Build/GithubBuild.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/PHPCI/Model/Build/GithubBuild.php b/PHPCI/Model/Build/GithubBuild.php
index d6b2b7b9..81510ae0 100644
--- a/PHPCI/Model/Build/GithubBuild.php
+++ b/PHPCI/Model/Build/GithubBuild.php
@@ -201,6 +201,8 @@ class GithubBuild extends RemoteGitBuild
      */
     protected function getDiffLineNumber(Builder $builder, $file, $line)
     {
+        $line = (integer)$line;
+
         $builder->logExecOutput(false);
 
         $prNumber = $this->getExtra('pull_request_number');

From 15b6917f6802881c3c495e480db943b376ed3a2c Mon Sep 17 00:00:00 2001
From: Vaidas Zilionis 
Date: Sun, 14 Dec 2014 17:47:46 +0200
Subject: [PATCH 207/329] Allow see project build status in cctray xml format

Refactoring is done for BuildStatus information.
- Fixed all phpcs, phpmd errors
- Added test for my code (hurray 100 tests already :D)

Closed #705
---
 PHPCI/Controller/BuildStatusController.php    |  62 ++++-
 PHPCI/Service/BuildStatusService.php          | 222 ++++++++++++++++++
 PHPCI/Store/BuildStore.php                    |  21 ++
 .../PHPCI/Service/BuiltStatusServiceTest.php  | 212 +++++++++++++++++
 4 files changed, 514 insertions(+), 3 deletions(-)
 create mode 100644 PHPCI/Service/BuildStatusService.php
 create mode 100644 Tests/PHPCI/Service/BuiltStatusServiceTest.php

diff --git a/PHPCI/Controller/BuildStatusController.php b/PHPCI/Controller/BuildStatusController.php
index 06f9400b..62442bf8 100644
--- a/PHPCI/Controller/BuildStatusController.php
+++ b/PHPCI/Controller/BuildStatusController.php
@@ -15,6 +15,7 @@ use b8\Store;
 use PHPCI\BuildFactory;
 use PHPCI\Model\Project;
 use PHPCI\Model\Build;
+use PHPCI\Service\BuildStatusService;
 
 /**
 * Build Status Controller - Allows external access to build status information / images.
@@ -24,10 +25,9 @@ use PHPCI\Model\Build;
 */
 class BuildStatusController extends \PHPCI\Controller
 {
-    /**
-     * @var \PHPCI\Store\ProjectStore
-     */
+    /* @var \PHPCI\Store\ProjectStore */
     protected $projectStore;
+    /* @var \PHPCI\Store\BuildStore */
     protected $buildStore;
 
     /**
@@ -70,6 +70,62 @@ class BuildStatusController extends \PHPCI\Controller
         return $status;
     }
 
+    /**
+     * Displays projects information in ccmenu format
+     *
+     * @param $projectId
+     * @return bool
+     * @throws \Exception
+     * @throws b8\Exception\HttpException
+     */
+    public function ccxml($projectId)
+    {
+        /* @var Project $project */
+        $project = $this->projectStore->getById($projectId);
+        $xml = new \SimpleXMLElement('');
+
+        if (!$project instanceof Project || !$project->getAllowPublicStatus()) {
+            return $this->renderXml($xml);
+        }
+
+        try {
+            $branchList = $this->buildStore->getBuildBranches($projectId);
+
+            if (!$branchList) {
+                $branchList = array($project->getBranch());
+            }
+
+            foreach ($branchList as $branch) {
+                $buildStatusService = new BuildStatusService($branch, $project, $project->getLatestBuild($branch));
+                if ($attributes = $buildStatusService->toArray()) {
+                    $projectXml = $xml->addChild('Project');
+                    foreach ($attributes as $attributeKey => $attributeValue) {
+                        $projectXml->addAttribute($attributeKey, $attributeValue);
+                    }
+                }
+            }
+
+        } catch (\Exception $e) {
+            $xml = new \SimpleXMLElement('');
+        }
+
+        return $this->renderXml($xml);
+    }
+
+    /**
+     * @param \SimpleXMLElement $xml
+     * @return bool
+     */
+    protected function renderXml(\SimpleXMLElement $xml = null)
+    {
+        $this->response->setHeader('Content-Type', 'text/xml');
+        $this->response->setContent($xml->asXML());
+        $this->response->flush();
+        echo $xml->asXML();
+
+        return true;
+    }
+
     /**
     * Returns the appropriate build status image in SVG format for a given project.
     */
diff --git a/PHPCI/Service/BuildStatusService.php b/PHPCI/Service/BuildStatusService.php
new file mode 100644
index 00000000..b4f3c009
--- /dev/null
+++ b/PHPCI/Service/BuildStatusService.php
@@ -0,0 +1,222 @@
+project = $project;
+        $this->branch = $branch;
+        $this->build = $build;
+        if ($this->build) {
+            $this->loadParentBuild($isParent);
+        }
+        if (defined('PHPCI_URL')) {
+            $this->setUrl(PHPCI_URL);
+        }
+    }
+
+    /**
+     * @param $url
+     */
+    public function setUrl($url)
+    {
+        $this->url = $url;
+    }
+
+    /**
+     * @return Build
+     */
+    public function getBuild()
+    {
+        return $this->build;
+    }
+
+    /**
+     * @param bool $isParent
+     * @throws \Exception
+     */
+    protected function loadParentBuild($isParent = true)
+    {
+        if ($isParent === false && !$this->isFinished()) {
+            $lastFinishedBuild = $this->project->getLatestBuild($this->branch, $this->finishedStatusIds);
+
+            if ($lastFinishedBuild) {
+                $this->prevService = new BuildStatusService(
+                    $this->branch,
+                    $this->project,
+                    $lastFinishedBuild,
+                    true
+                );
+            }
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function getActivity()
+    {
+        if (in_array($this->build->getStatus(), $this->finishedStatusIds)) {
+            return 'Sleeping';
+        } elseif ($this->build->getStatus() == Build::STATUS_NEW) {
+            return 'Pending';
+        } elseif ($this->build->getStatus() == Build::STATUS_RUNNING) {
+            return 'Building';
+        }
+        return 'Unknown';
+    }
+
+    /**
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->project->getTitle() . ' / ' . $this->branch;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isFinished()
+    {
+        if (in_array($this->build->getStatus(), $this->finishedStatusIds)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * @return null|Build
+     */
+    public function getFinishedBuildInfo()
+    {
+        if ($this->isFinished()) {
+            return $this->build;
+        } elseif ($this->prevService) {
+            return $this->prevService->getBuild();
+        }
+        return null;
+    }
+
+    /**
+     * @return int|string
+     */
+    public function getLastBuildLabel()
+    {
+        if ($buildInfo = $this->getFinishedBuildInfo()) {
+            return $buildInfo->getId();
+        }
+        return '';
+    }
+
+    /**
+     * @return string
+     */
+    public function getLastBuildTime()
+    {
+        $dateFormat = 'Y-m-d\\TH:i:sO';
+        if ($buildInfo = $this->getFinishedBuildInfo()) {
+            return ($buildInfo->getFinished()) ? $buildInfo->getFinished()->format($dateFormat) : '';
+        }
+        return '';
+    }
+
+    /**
+     * @param Build $build
+     * @return string
+     */
+    public function getBuildStatus(Build $build)
+    {
+        switch ($build->getStatus()) {
+            case Build::STATUS_SUCCESS:
+                return 'Success';
+            case Build::STATUS_FAILED:
+                return 'Failure';
+        }
+        return 'Unknown';
+    }
+
+    /**
+     * @return string
+     */
+    public function getLastBuildStatus()
+    {
+        if ($build = $this->getFinishedBuildInfo()) {
+            return $this->getBuildStatus($build);
+        }
+        return '';
+    }
+
+    /**
+     * @return string
+     */
+    public function getBuildUrl()
+    {
+         return $this->url . 'build/view/' . $this->build->getId();
+    }
+
+    /**
+     * @return array
+     */
+    public function toArray()
+    {
+        if (!$this->build) {
+            return array();
+        }
+        return array(
+            'name' => $this->getName(),
+            'activity' => $this->getActivity(),
+            'lastBuildLabel' => $this->getLastBuildLabel(),
+            'lastBuildStatus' => $this->getLastBuildStatus(),
+            'lastBuildTime' => $this->getLastBuildTime(),
+            'webUrl' => $this->getBuildUrl(),
+        );
+    }
+}
diff --git a/PHPCI/Store/BuildStore.php b/PHPCI/Store/BuildStore.php
index 3a4c0ddc..7519a12f 100644
--- a/PHPCI/Store/BuildStore.php
+++ b/PHPCI/Store/BuildStore.php
@@ -107,6 +107,27 @@ class BuildStore extends BuildStoreBase
         }
     }
 
+    /**
+     * Returns all registered branches for project
+     *
+     * @param $projectId
+     * @return array
+     * @throws \Exception
+     */
+    public function getBuildBranches($projectId)
+    {
+        $query = 'SELECT DISTINCT `branch` FROM `build` WHERE `project_id` = :project_id';
+        $stmt = Database::getConnection('read')->prepare($query);
+        $stmt->bindValue(':project_id', $projectId);
+
+        if ($stmt->execute()) {
+            $res = $stmt->fetchAll(\PDO::FETCH_COLUMN);
+            return $res;
+        } else {
+            return array();
+        }
+    }
+
     /**
      * Return build metadata by key, project and optionally build id.
      * @param $key
diff --git a/Tests/PHPCI/Service/BuiltStatusServiceTest.php b/Tests/PHPCI/Service/BuiltStatusServiceTest.php
new file mode 100644
index 00000000..91e115e4
--- /dev/null
+++ b/Tests/PHPCI/Service/BuiltStatusServiceTest.php
@@ -0,0 +1,212 @@
+
+ */
+class BuildStatusServiceTest extends \PHPUnit_Framework_TestCase
+{
+    const BRANCH = 'master';
+
+    /** @var  Project */
+    protected $project;
+
+    protected $timezone;
+
+    public function setUp()
+    {
+        $project = new Project();
+        $project->setId(3);
+        $project->setBranch(self::BRANCH);
+        $project->setTitle('Test');
+
+        $this->project = $project;
+        $this->timezone = date_default_timezone_get();
+
+        date_default_timezone_set('UTC');
+    }
+
+    public function tearDown()
+    {
+        date_default_timezone_set($this->timezone);
+    }
+
+    /**
+     * @param $configId
+     * @param bool $setProject
+     * @return Build
+     */
+    protected function getBuild($configId, $setProject = true)
+    {
+        $config = array(
+            '1' => array(
+                'status' => Build::STATUS_RUNNING,
+                'id' => 77,
+                'finishDateTime' => null,
+                'startedDate' => '2014-10-25 21:20:02',
+                'previousBuild' => null,
+            ),
+            '2' => array(
+                'status' => Build::STATUS_RUNNING,
+                'id' => 78,
+                'finishDateTime' => null,
+                'startedDate' => '2014-10-25 21:20:02',
+                'previousBuild' => 4,
+            ),
+            '3' => array(
+                'status' => Build::STATUS_SUCCESS,
+                'id' => 7,
+                'finishDateTime' => '2014-10-25 21:50:02',
+                'startedDate' => '2014-10-25 21:20:02',
+                'previousBuild' => null,
+            ),
+            '4' => array(
+                'status' => Build::STATUS_FAILED,
+                'id' => 13,
+                'finishDateTime' => '2014-10-13 13:13:13',
+                'previousBuild' => null,
+            ),
+            '5' => array(
+                'status' => Build::STATUS_NEW,
+                'id' => 1000,
+                'finishDateTime' => '2014-12-25 21:12:21',
+                'previousBuild' => 3,
+            )
+        );
+
+        $build = new Build();
+        $build->setId($config[$configId]['id']);
+        $build->setBranch(self::BRANCH);
+        $build->setStatus($config[$configId]['status']);
+        if ($config[$configId]['finishDateTime']) {
+            $build->setFinished(new \DateTime($config[$configId]['finishDateTime']));
+        }
+        if (!empty($config[$configId]['startedDate'])) {
+            $build->setStarted(new \DateTime('2014-10-25 21:20:02'));
+        }
+
+        $project = $this->getProjectMock($config[$configId]['previousBuild'], $setProject);
+
+        $build->setProjectObject($project);
+
+        return $build;
+    }
+
+    /**
+     * @param null|int $prevBuildId
+     * @param bool $setProject
+     * @return Project
+     */
+    protected function getProjectMock($prevBuildId = null, $setProject = true) {
+
+        $project = $this->getMock('PHPCI\Model\Project', array('getLatestBuild'));
+
+        $prevBuild = ($prevBuildId) ? $this->getBuild($prevBuildId, false) : null;
+
+        $project->expects($this->any())
+            ->method('getLatestBuild')
+            ->will($this->returnValue($prevBuild));
+
+        /* @var $project Project */
+
+        $project->setId(3);
+        $project->setBranch(self::BRANCH);
+        $project->setTitle('Test');
+
+        if ($setProject) {
+            $this->project = $project;
+        }
+
+        return $project;
+
+    }
+
+    /**
+     * @dataProvider finishedProvider
+     *
+     * @param int $buildConfigId
+     * @param array $expectedResult
+     */
+    public function testFinished($buildConfigId, array $expectedResult)
+    {
+        $build = $this->getBuild($buildConfigId);
+        $service = new BuildStatusService(self::BRANCH, $this->project, $build);
+        $service->setUrl('http://phpci.dev/');
+        $this->assertEquals($expectedResult, $service->toArray());
+    }
+
+    public function finishedProvider()
+    {
+        return array(
+            'buildingStatus' => array(
+                1,
+                array(
+                    'name' => 'Test / master',
+                    'activity' => 'Building',
+                    'lastBuildLabel' => '',
+                    'lastBuildStatus' => '',
+                    'lastBuildTime' => '',
+                    'webUrl' => 'http://phpci.dev/build/view/77',
+                )
+            ),
+            'buildingStatusWithPrev' => array(
+                2,
+                array(
+                    'name' => 'Test / master',
+                    'activity' => 'Building',
+                    'lastBuildLabel' => 13,
+                    'lastBuildStatus' => 'Failure',
+                    'lastBuildTime' => '2014-10-13T13:13:13+0000',
+                    'webUrl' => 'http://phpci.dev/build/view/78',
+                )
+            ),
+            'successStatus' => array(
+                3,
+                array(
+                    'name' => 'Test / master',
+                    'activity' => 'Sleeping',
+                    'lastBuildLabel' => 7,
+                    'lastBuildStatus' => 'Success',
+                    'lastBuildTime' => '2014-10-25T21:50:02+0000',
+                    'webUrl' => 'http://phpci.dev/build/view/7',
+                )
+            ),
+            'failureStatus' => array(
+                4,
+                array(
+                    'name' => 'Test / master',
+                    'activity' => 'Sleeping',
+                    'lastBuildLabel' => 13,
+                    'lastBuildStatus' => 'Failure',
+                    'lastBuildTime' => '2014-10-13T13:13:13+0000',
+                    'webUrl' => 'http://phpci.dev/build/view/13',
+                )
+            ),
+            'pending' => array(
+                5,
+                array(
+                    'name' => 'Test / master',
+                    'activity' => 'Pending',
+                    'lastBuildLabel' => 7,
+                    'lastBuildStatus' => 'Success',
+                    'lastBuildTime' => '2014-10-25T21:50:02+0000',
+                    'webUrl' => 'http://phpci.dev/build/view/1000',
+                )
+            ),
+        );
+    }
+}
\ No newline at end of file

From 4edefee761efd2a713bddde33ceb0b562463a7b7 Mon Sep 17 00:00:00 2001
From: Adirelle 
Date: Thu, 9 Apr 2015 08:51:45 +0200
Subject: [PATCH 208/329] Reworked the DaemonCommand.

* Accepts options for PID and log file.
* Uses posix_kill whenever available.
* Checks that the daemon actually started or stopped.
* Try to terminate then kill the daemon.
* Uses the logger or output instead of "echo".

Added a ProcessControl interface and implementations.

Closed #908
---
 PHPCI/Command/DaemonCommand.php               | 170 +++++++++++++-----
 PHPCI/ProcessControl/Factory.php              |  63 +++++++
 PHPCI/ProcessControl/PosixProcessControl.php  |  52 ++++++
 .../ProcessControlInterface.php               |  33 ++++
 PHPCI/ProcessControl/UnixProcessControl.php   |  54 ++++++
 .../ProcessControl/WindowsProcessControl.php  |  54 ++++++
 .../PosixProcessControlTest.php               |  17 ++
 .../ProcessControl/ProcessControlTest.php     | 126 +++++++++++++
 .../ProcessControl/UnixProcessControlTest.php |  22 +++
 .../WindowsProcessControlTest.php             |  22 +++
 composer.json                                 |   6 +
 11 files changed, 573 insertions(+), 46 deletions(-)
 create mode 100644 PHPCI/ProcessControl/Factory.php
 create mode 100644 PHPCI/ProcessControl/PosixProcessControl.php
 create mode 100644 PHPCI/ProcessControl/ProcessControlInterface.php
 create mode 100644 PHPCI/ProcessControl/UnixProcessControl.php
 create mode 100644 PHPCI/ProcessControl/WindowsProcessControl.php
 create mode 100644 Tests/PHPCI/ProcessControl/PosixProcessControlTest.php
 create mode 100644 Tests/PHPCI/ProcessControl/ProcessControlTest.php
 create mode 100644 Tests/PHPCI/ProcessControl/UnixProcessControlTest.php
 create mode 100644 Tests/PHPCI/ProcessControl/WindowsProcessControlTest.php

diff --git a/PHPCI/Command/DaemonCommand.php b/PHPCI/Command/DaemonCommand.php
index e51f31f1..cb303eff 100644
--- a/PHPCI/Command/DaemonCommand.php
+++ b/PHPCI/Command/DaemonCommand.php
@@ -1,4 +1,5 @@
 
-* @package      PHPCI
-* @subpackage   Console
-*/
+ * Daemon that loops and call the run-command.
+ * @author       Gabriel Baker 
+ * @package      PHPCI
+ * @subpackage   Console
+ */
 class DaemonCommand extends Command
 {
+
     /**
-     * @var \Monolog\Logger
+     * @var Logger
      */
     protected $logger;
 
-    public function __construct(Logger $logger, $name = null)
+    /**
+     * @var string
+     */
+    protected $pidFilePath;
+
+    /**
+     * @var string
+     */
+    protected $logFilePath;
+
+    /**
+     * @var ProcessControlInterface
+     */
+    protected $processControl;
+
+    public function __construct(Logger $logger, ProcessControlInterface $processControl = null, $name = null)
     {
         parent::__construct($name);
         $this->logger = $logger;
+        $this->processControl = $processControl ?: Factory::getInstance();
     }
 
     protected function configure()
@@ -40,17 +61,30 @@ class DaemonCommand extends Command
             ->setName('phpci:daemon')
             ->setDescription('Initiates the daemon to run commands.')
             ->addArgument(
-                'state',
-                InputArgument::REQUIRED,
-                'start|stop|status'
-            );
+                'state', InputArgument::REQUIRED, 'start|stop|status'
+            )
+            ->addOption(
+                'pid-file', 'p', InputOption::VALUE_REQUIRED,
+                'Path of the PID file',
+                implode(DIRECTORY_SEPARATOR,
+                    array(PHPCI_DIR, 'daemon', 'daemon.pid'))
+            )
+            ->addOption(
+                'log-file', 'l', InputOption::VALUE_REQUIRED,
+                'Path of the log file',
+                implode(DIRECTORY_SEPARATOR,
+                    array(PHPCI_DIR, 'daemon', 'daemon.log'))
+        );
     }
 
     /**
-    * Loops through running.
-    */
+     * Loops through running.
+     */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        $this->pidFilePath = $input->getOption('pid-file');
+        $this->logFilePath = $input->getOption('log-file');
+
         $state = $input->getArgument('state');
 
         switch ($state) {
@@ -61,64 +95,108 @@ class DaemonCommand extends Command
                 $this->stopDaemon();
                 break;
             case 'status':
-                $this->statusDaemon();
+                $this->statusDaemon($output);
                 break;
             default:
-                echo "Not a valid choice, please use start stop or status";
+                $this->output->writeln("Not a valid choice, please use start, stop or status");
                 break;
         }
-
     }
 
     protected function startDaemon()
     {
-
-        if (file_exists(PHPCI_DIR.'/daemon/daemon.pid')) {
-            echo "Already started\n";
-            $this->logger->warning("Daemon already started");
+        $pid = $this->getRunningPid();
+        if ($pid) {
+            $this->logger->notice("Daemon already started", array('pid' => $pid));
             return "alreadystarted";
         }
 
-        $logfile = PHPCI_DIR."/daemon/daemon.log";
+        $this->logger->info("Trying to start the daemon");
+
         $cmd = "nohup %s/daemonise phpci:daemonise > %s 2>&1 &";
-        $command = sprintf($cmd, PHPCI_DIR, $logfile);
-        $this->logger->info("Daemon started");
-        exec($command);
+        $command = sprintf($cmd, PHPCI_DIR, $this->logFilePath);
+        $output = $exitCode = null;
+        exec($command, $output, $exitCode);
+
+        if ($exitCode !== 0) {
+            $this->logger->error(sprintf("daemonise exited with status %d", $exitCode));
+            return "notstarted";
+        }
+
+        for ($i = 0; !($pid = $this->getRunningPid()) && $i < 5; $i++) {
+            sleep(1);
+        }
+
+        if (!$pid) {
+            $this->logger->error("Could not start the daemon");
+            return "notstarted";
+        }
+
+        $this->logger->notice("Daemon started", array('pid' => $pid));
+        return "started";
     }
 
     protected function stopDaemon()
     {
-
-        if (!file_exists(PHPCI_DIR.'/daemon/daemon.pid')) {
-            echo "Not started\n";
-            $this->logger->warning("Can't stop daemon as not started");
+        $pid = $this->getRunningPid();
+        if (!$pid) {
+            $this->logger->notice("Cannot stop the daemon as it is not started");
             return "notstarted";
         }
 
-        $cmd = "kill $(cat %s/daemon/daemon.pid)";
-        $command = sprintf($cmd, PHPCI_DIR);
-        exec($command);
-        $this->logger->info("Daemon stopped");
-        unlink(PHPCI_DIR.'/daemon/daemon.pid');
-    }
+        $this->logger->info("Trying to terminate the daemon", array('pid' => $pid));
+        $this->processControl->kill($pid);
 
-    protected function statusDaemon()
-    {
-
-        if (!file_exists(PHPCI_DIR.'/daemon/daemon.pid')) {
-            echo "Not running\n";
-            return "notrunning";
+        for ($i = 0; ($pid = $this->getRunningPid()) && $i < 5; $i++) {
+            sleep(1);
         }
 
-        $pid = trim(file_get_contents(PHPCI_DIR.'/daemon/daemon.pid'));
-        $pidcheck = sprintf("/proc/%s", $pid);
-        if (is_dir($pidcheck)) {
-            echo "Running\n";
+        if ($pid) {
+            $this->logger->warning("The daemon is resiting, trying to kill it", array('pid' => $pid));
+            $this->processControl->kill($pid, true);
+
+            for ($i = 0; ($pid = $this->getRunningPid()) && $i < 5; $i++) {
+                sleep(1);
+            }
+        }
+
+        if (!$pid) {
+            $this->logger->notice("Daemon stopped");
+            return "stopped";
+        }
+
+        $this->logger->error("Could not stop the daemon");
+    }
+
+    protected function statusDaemon(OutputInterface $output)
+    {
+        $pid = $this->getRunningPid();
+        if ($pid) {
+            $output->writeln(sprintf('The daemon is running, PID: %d', $pid));
             return "running";
         }
 
-        unlink(PHPCI_DIR.'/daemon/daemon.pid');
-        echo "Not running\n";
+        $output->writeln('The daemon is not running');
         return "notrunning";
     }
+
+    /** Check if there is a running daemon
+     *
+     * @return int|null
+     */
+    protected function getRunningPid()
+    {
+        if (!file_exists($this->pidFilePath)) {
+            return;
+        }
+
+        $pid = intval(trim(file_get_contents($this->pidFilePath)));
+
+        if($this->processControl->isRunning($pid, true)) {
+            return $pid;
+        }
+
+        // Not found, remove the stale PID file
+        unlink($this->pidFilePath);
+    }
 }
diff --git a/PHPCI/ProcessControl/Factory.php b/PHPCI/ProcessControl/Factory.php
new file mode 100644
index 00000000..a1aa2354
--- /dev/null
+++ b/PHPCI/ProcessControl/Factory.php
@@ -0,0 +1,63 @@
+
+ */
+class Factory
+{
+    /**
+     * ProcessControl singleton.
+     *
+     * @var ProcessControlInterface
+     */
+    protected static $instance = null;
+
+    /**
+     * Returns the ProcessControl singleton.
+     *
+     * @return ProcessControlInterface
+     */
+    public static function getInstance()
+    {
+        if (static::$instance === null) {
+            static::$instance = static::createProcessControl();
+        }
+        return static::$instance;
+    }
+
+    /**
+     * Create a ProcessControl depending on available extensions and the underlying OS.
+     *
+     * Check PosixProcessControl, WindowsProcessControl and UnixProcessControl, in that order.
+     *
+     * @return ProcessControlInterface
+     *
+     * @internal
+     */
+    public static function createProcessControl()
+    {
+        switch(true) {
+            case PosixProcessControl::isAvailable():
+                return new PosixProcessControl();
+
+            case WindowsProcessControl::isAvailable():
+                return new WindowsProcessControl();
+
+            case UnixProcessControl::isAvailable():
+                return new UnixProcessControl();
+        }
+
+        throw new \Exception("No ProcessControl implementation available.");
+    }
+}
diff --git a/PHPCI/ProcessControl/PosixProcessControl.php b/PHPCI/ProcessControl/PosixProcessControl.php
new file mode 100644
index 00000000..710ba9f1
--- /dev/null
+++ b/PHPCI/ProcessControl/PosixProcessControl.php
@@ -0,0 +1,52 @@
+
+ */
+class PosixProcessControl implements ProcessControlInterface
+{
+    /**
+     *
+     * @param int $pid
+     * @return bool
+     */
+    public function isRunning($pid)
+    {
+        // Signal "0" is not sent to the process, but posix_kill checks the process anyway;
+        return posix_kill($pid, 0);
+    }
+
+    /**
+     * Sends a TERMINATE or KILL signal to the process using posix_kill.
+     *
+     * @param int $pid
+     * @param bool $forcefully Whetehr to send TERMINATE (false) or KILL (true).
+     */
+    public function kill($pid, $forcefully = false)
+    {
+        posix_kill($pid, $forcefully ? 9 : 15);
+    }
+
+    /**
+     * Check whether this posix_kill is available.
+     *
+     * @return bool
+     *
+     * @internal
+     */
+    public static function isAvailable()
+    {
+        return function_exists('posix_kill');
+    }
+}
diff --git a/PHPCI/ProcessControl/ProcessControlInterface.php b/PHPCI/ProcessControl/ProcessControlInterface.php
new file mode 100644
index 00000000..709e0bee
--- /dev/null
+++ b/PHPCI/ProcessControl/ProcessControlInterface.php
@@ -0,0 +1,33 @@
+
+ */
+interface ProcessControlInterface
+{
+    /** Checks if a process exists.
+     *
+     * @param int $pid The process identifier.
+     *
+     * @return boolean true is the process is running, else false.
+     */
+    public function isRunning($pid);
+
+    /** Terminate a running process.
+     *
+     * @param int $pid The process identifier.
+     * @param bool $forcefully Whether to gently (false) or forcefully (true) terminate the process.
+     */
+    public function kill($pid, $forcefully = false);
+}
diff --git a/PHPCI/ProcessControl/UnixProcessControl.php b/PHPCI/ProcessControl/UnixProcessControl.php
new file mode 100644
index 00000000..8b638073
--- /dev/null
+++ b/PHPCI/ProcessControl/UnixProcessControl.php
@@ -0,0 +1,54 @@
+
+ */
+class UnixProcessControl implements ProcessControlInterface
+{
+    /**
+     * Check process using the "ps" command.
+     *
+     * @param int $pid
+     * @return boolean
+     */
+    public function isRunning($pid)
+    {
+        $output = $exitCode = null;
+        exec(sprintf("ps %d", $pid), $output, $exitCode);
+        return $exitCode === 0;
+    }
+
+    /**
+     * Sends a signal using the "kill" command.
+     *
+     * @param int $pid
+     * @param bool $forcefully
+     */
+    public function kill($pid, $forcefully = false)
+    {
+        exec(sprintf("kill -%d %d", $forcefully ? 9 : 15, $pid));
+    }
+
+    /**
+     * Check whether the commands "ps" and "kill" are available.
+     *
+     * @return bool
+     *
+     * @internal
+     */
+    public static function isAvailable()
+    {
+        return DIRECTORY_SEPARATOR === '/' && exec("which ps") && exec("which kill");
+    }
+}
diff --git a/PHPCI/ProcessControl/WindowsProcessControl.php b/PHPCI/ProcessControl/WindowsProcessControl.php
new file mode 100644
index 00000000..e750d321
--- /dev/null
+++ b/PHPCI/ProcessControl/WindowsProcessControl.php
@@ -0,0 +1,54 @@
+
+ */
+class WindowsProcessControl implements ProcessControlInterface
+{
+    /**
+     * Check if the process is running using the "tasklist" command.
+     *
+     * @param type $pid
+     * @return bool
+     */
+    public function isRunning($pid)
+    {
+        $lastLine = exec(sprintf('tasklist /fi "PID eq %d" /nh /fo csv 2>nul:', $pid));
+        $record = str_getcsv($lastLine);
+        return isset($record[1]) && intval($record[1]) === $pid;
+    }
+
+    /**
+     * Terminate the process using the "taskkill" command.
+     *
+     * @param type $pid
+     * @param bool $forcefully
+     */
+    public function kill($pid, $forcefully = false)
+    {
+        exec(sprintf("taskkill /t /pid %d %s 2>nul:", $pid, $forcefully ? '/f' : ''));
+    }
+
+    /**
+     * Check whether the commands "tasklist" and "taskkill" are available.
+     *
+     * @return bool
+     *
+     * @internal
+     */
+    public static function isAvailable()
+    {
+        return DIRECTORY_SEPARATOR === '\\' && exec("where tasklist") && exec("where taskkill");
+    }
+}
diff --git a/Tests/PHPCI/ProcessControl/PosixProcessControlTest.php b/Tests/PHPCI/ProcessControl/PosixProcessControlTest.php
new file mode 100644
index 00000000..96bbf5b4
--- /dev/null
+++ b/Tests/PHPCI/ProcessControl/PosixProcessControlTest.php
@@ -0,0 +1,17 @@
+object = new PosixProcessControl();
+    }
+
+    public function testIsAvailable()
+    {
+        $this->assertEquals(function_exists('posix_kill'), PosixProcessControl::isAvailable());
+    }
+}
diff --git a/Tests/PHPCI/ProcessControl/ProcessControlTest.php b/Tests/PHPCI/ProcessControl/ProcessControlTest.php
new file mode 100644
index 00000000..52022743
--- /dev/null
+++ b/Tests/PHPCI/ProcessControl/ProcessControlTest.php
@@ -0,0 +1,126 @@
+pipes = array();
+
+        $this->process = proc_open($this->getTestCommand(), $desc, $this->pipes);
+        usleep(500);
+
+        $this->assertTrue(is_resource($this->process));
+        $this->assertTrue($this->isRunning());
+
+        $status = proc_get_status($this->process);
+        return $status['pid'];
+    }
+
+    /** End the running process.
+     *
+     * @return int
+     */
+    protected function endProcess()
+    {
+        if (!is_resource($this->process)) {
+            return;
+        }
+        array_map('fclose', $this->pipes);
+        $exitCode = proc_close($this->process);
+        $this->assertFalse($this->isRunning());
+        $this->process = null;
+        return $exitCode;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isRunning()
+    {
+        if (!is_resource($this->process)) {
+            return false;
+        }
+        $status = proc_get_status($this->process);
+        return $status['running'];
+    }
+
+    public function testIsRunning()
+    {
+        if (!$this->object->isAvailable()) {
+            $this->markTestSkipped();
+        }
+
+        $pid = $this->startProcess();
+
+        $this->assertTrue($this->object->isRunning($pid));
+
+        fwrite($this->pipes[0], PHP_EOL);
+
+        $exitCode = $this->endProcess();
+
+        $this->assertEquals(0, $exitCode);
+        $this->assertFalse($this->object->isRunning($pid));
+    }
+
+    public function testSoftKill()
+    {
+        if (!$this->object->isAvailable()) {
+            $this->markTestSkipped();
+        }
+
+        $pid = $this->startProcess();
+
+        $this->object->kill($pid);
+        usleep(500);
+
+        $this->assertFalse($this->isRunning());
+    }
+
+    public function testForcefullyKill()
+    {
+        if (!$this->object->isAvailable()) {
+            $this->markTestSkipped();
+        }
+
+        $pid = $this->startProcess();
+
+        $this->object->kill($pid, true);
+        usleep(500);
+
+        $this->assertFalse($this->isRunning());
+    }
+
+    abstract public function testIsAvailable();
+
+    abstract public function getTestCommand();
+
+    protected function tearDown()
+    {
+        parent::tearDown();
+        $this->endProcess();
+    }
+}
diff --git a/Tests/PHPCI/ProcessControl/UnixProcessControlTest.php b/Tests/PHPCI/ProcessControl/UnixProcessControlTest.php
new file mode 100644
index 00000000..9b102a73
--- /dev/null
+++ b/Tests/PHPCI/ProcessControl/UnixProcessControlTest.php
@@ -0,0 +1,22 @@
+object = new UnixProcessControl();
+    }
+
+    public function getTestCommand()
+    {
+        return "read SOMETHING";
+    }
+
+    public function testIsAvailable()
+    {
+        $this->assertEquals(DIRECTORY_SEPARATOR === '/', UnixProcessControl::isAvailable());
+    }
+}
diff --git a/Tests/PHPCI/ProcessControl/WindowsProcessControlTest.php b/Tests/PHPCI/ProcessControl/WindowsProcessControlTest.php
new file mode 100644
index 00000000..ed10fc95
--- /dev/null
+++ b/Tests/PHPCI/ProcessControl/WindowsProcessControlTest.php
@@ -0,0 +1,22 @@
+object = new WindowsProcessControl;
+    }
+
+    public function getTestCommand()
+    {
+        return "pause";
+    }
+
+    public function testIsAvailable()
+    {
+        $this->assertEquals(DIRECTORY_SEPARATOR === '\\', WindowsProcessControl::isAvailable());
+    }
+}
diff --git a/composer.json b/composer.json
index c6d8e92b..eadd9a81 100644
--- a/composer.json
+++ b/composer.json
@@ -28,6 +28,12 @@
         }
     },
 
+    "autoload-dev": {
+        "psr-4": {
+            "Tests\\PHPCI\\": "Tests/PHPCI/"
+        }
+    },
+
     "require": {
         "php": ">=5.3.8",
         "ext-pdo": "*",

From 8549ba30cf7703e02a1d70873ff6284e64075314 Mon Sep 17 00:00:00 2001
From: Adirelle 
Date: Thu, 23 Apr 2015 15:47:47 +0200
Subject: [PATCH 209/329] PHPUnit display: escape HTML code in test messages.

PHPUnit display: display data produced before the TapParser refactoring.

Closed #937
---
 public/assets/js/build-plugins/phpunit.js | 28 +++++++++++++++--------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/public/assets/js/build-plugins/phpunit.js b/public/assets/js/build-plugins/phpunit.js
index 66f010a1..71495603 100644
--- a/public/assets/js/build-plugins/phpunit.js
+++ b/public/assets/js/build-plugins/phpunit.js
@@ -68,18 +68,26 @@ var phpunitPlugin = ActiveBuild.UiPlugin.extend({
         var counts = { success: 0, fail: 0, error: 0, skipped: 0, todo: 0 }, total = 0;
 
         for (var i in tests) {
-            var severity = tests[i].severity || 'success',
-                message = tests[i].message || ('' + Lang.get('test_no_message') + '');
+            var content = $(''),
+                message = $('
    ').appendTo(content),
+                severity = tests[i].severity || (tests[i].pass ? 'success' : 'failed');
+
+            if (tests[i].message) {
+                message.text(tests[i].message);
+            } else if (tests[i].test && tests[i].suite) {
+                message.text(tests[i].suite + '::' + tests[i].test);
+            } else {
+                message.html('' + Lang.get('test_no_message') + '');
+            }
+
+            if (tests[i].data) {
+                content.append('
    ' + this.repr(tests[i].data) + '
    ');
+            }
+
+            $('').append(content).appendTo(tbody);
+
             counts[severity]++;
             total++;
-            tbody.append(
-                '' +
-                    '' +
-                        '
    ' + message + '
    ' +
-                        (tests[i].data ? '
    ' + this.repr(tests[i].data) + '
    ' : '') +
-                    '' +
-                ''
-            );
         }
 
         var checkboxes = $('');

From ad29ba4cfdf17b214af2b8c165172b9376bbeed2 Mon Sep 17 00:00:00 2001
From: Adirelle 
Date: Fri, 24 Apr 2015 19:33:13 +0200
Subject: [PATCH 210/329] Track and display the build progression, for each
 stages and plugins. Translations for the build summary.

Closed #944
---
 PHPCI/Languages/lang.en.php               |  11 +++
 PHPCI/Languages/lang.fr.php               |  11 +++
 PHPCI/Plugin/Util/Executor.php            | 109 +++++++++++++++++-----
 PHPCI/Plugin/Util/Factory.php             |   8 +-
 PHPCI/Store/BuildStore.php                |   4 +-
 Tests/PHPCI/Plugin/Util/ExecutorTest.php  |  15 ++-
 public/assets/js/build-plugins/summary.js |  67 +++++++++++++
 7 files changed, 192 insertions(+), 33 deletions(-)
 create mode 100644 public/assets/js/build-plugins/summary.js

diff --git a/PHPCI/Languages/lang.en.php b/PHPCI/Languages/lang.en.php
index d6c48754..9729d746 100644
--- a/PHPCI/Languages/lang.en.php
+++ b/PHPCI/Languages/lang.en.php
@@ -295,6 +295,17 @@ PHPCI',
     'search_packagist_for_more' => 'Search Packagist for more packages',
     'search' => 'Search »',
 
+    // Summary plugin
+    'build-summary' => 'Summary',
+    'stage' => 'Stage',
+    'duration' => 'Duration',
+    'plugin' => 'Plugin',
+    'stage_setup' => 'Setup',
+    'stage_test' => 'Test',
+    'stage_complete' => 'Complete',
+    'stage_success' => 'Success',
+    'stage_failure' => 'Failure',
+
     // Installer
     'installation_url' => 'PHPCI Installation URL',
     'db_host' => 'Database Host',
diff --git a/PHPCI/Languages/lang.fr.php b/PHPCI/Languages/lang.fr.php
index f1ad7129..dcde8424 100644
--- a/PHPCI/Languages/lang.fr.php
+++ b/PHPCI/Languages/lang.fr.php
@@ -286,6 +286,17 @@ PHPCI',
     'search_packagist_for_more' => 'Rechercher sur Packagist pour trouver plus de paquets',
     'search' => 'Rechercher »',
 
+    // Summary plugin
+    'build-summary' => 'Résumé',
+    'stage' => 'Étape',
+    'duration' => 'Durée',
+    'plugin' => 'Plugin',
+    'stage_setup' => 'Préparation',
+    'stage_test' => 'Test',
+    'stage_complete' => 'Terminé',
+    'stage_success' => 'Succes',
+    'stage_failure' => 'Échec',
+
     // Installer
     'installation_url' => 'URL d\'installation de PHPCI',
     'db_host' => 'Hôte de la BDD',
diff --git a/PHPCI/Plugin/Util/Executor.php b/PHPCI/Plugin/Util/Executor.php
index 8c74707e..3ca244af 100644
--- a/PHPCI/Plugin/Util/Executor.php
+++ b/PHPCI/Plugin/Util/Executor.php
@@ -2,8 +2,12 @@
 
 namespace PHPCI\Plugin\Util;
 
+use b8\Store\Factory as StoreFactory;
+use Exception;
 use PHPCI\Helper\Lang;
-use \PHPCI\Logging\BuildLogger;
+use PHPCI\Logging\BuildLogger;
+use PHPCI\Model\Build;
+use PHPCI\Store\BuildStore;
 
 /**
  * Plugin Executor - Runs the configured plugins for a given build stage.
@@ -21,14 +25,20 @@ class Executor
      */
     protected $pluginFactory;
 
+    /**
+     * @var BuildStore
+     */
+    protected $store;
+
     /**
      * @param Factory $pluginFactory
      * @param BuildLogger $logger
      */
-    public function __construct(Factory $pluginFactory, BuildLogger $logger)
+    public function __construct(Factory $pluginFactory, BuildLogger $logger, BuildStore $store = null)
     {
         $this->pluginFactory = $pluginFactory;
         $this->logger = $logger;
+        $this->store = $store ?: StoreFactory::getStore('Build');
     }
 
     /**
@@ -48,22 +58,29 @@ class Executor
         foreach ($config[$stage] as $plugin => $options) {
             $this->logger->log(Lang::get('running_plugin', $plugin));
 
-            // Try and execute it:
-            if ($this->executePlugin($plugin, $options)) {
-                // Execution was successful:
-                $this->logger->logSuccess(Lang::get('plugin_success'));
-            } elseif ($stage == 'setup') {
-                // If we're in the "setup" stage, execution should not continue after
-                // a plugin has failed:
-                throw new \Exception('Plugin failed: ' . $plugin);
-            } else {
-                // If we're in the "test" stage and the plugin is not allowed to fail,
-                // then mark the build as failed:
-                if ($stage == 'test' && (!isset($options['allow_failures']) || !$options['allow_failures'])) {
-                    $success = false;
-                }
+            $this->setPluginStatus($stage, $plugin, Build::STATUS_RUNNING);
 
+            // Try and execute it
+            if ($this->executePlugin($plugin, $options)) {
+                // Execution was successful
+                $this->logger->logSuccess(Lang::get('plugin_success'));
+                $this->setPluginStatus($stage, $plugin, Build::STATUS_SUCCESS);
+            } else {
+                // Execution failed
                 $this->logger->logFailure(Lang::get('plugin_failed'));
+                $this->setPluginStatus($stage, $plugin, Build::STATUS_FAILED);
+
+                if ($stage === 'setup') {
+                    // If we're in the "setup" stage, execution should not continue after
+                    // a plugin has failed:
+                    throw new Exception('Plugin failed: ' . $plugin);
+                } elseif ($stage === 'test') {
+                    // If we're in the "test" stage and the plugin is not allowed to fail,
+                    // then mark the build as failed:
+                    if (empty($options['allow_failures'])) {
+                        $success = false;
+                    }
+                }
             }
         }
 
@@ -91,20 +108,62 @@ class Executor
             return false;
         }
 
-        $rtn = true;
-
-        // Try running it:
         try {
+            // Build and run it
             $obj = $this->pluginFactory->buildPlugin($class, $options);
-
-            if (!$obj->execute()) {
-                $rtn = false;
-            }
+            return $obj->execute();
         } catch (\Exception $ex) {
             $this->logger->logFailure(Lang::get('exception') . $ex->getMessage(), $ex);
-            $rtn = false;
+            return false;
+        }
+    }
+
+    /**
+     * Change the status of a plugin for a given stage.
+     *
+     * @param string $stage The builder stage.
+     * @param string $plugin The plugin name.
+     * @param int $status The new status.
+     */
+    protected function setPluginStatus($stage, $plugin, $status)
+    {
+        $summary = $this->getBuildSummary();
+
+        if (!isset($summary[$stage][$plugin])) {
+            $summary[$stage][$plugin] = array();
         }
 
-        return $rtn;
+        $summary[$stage][$plugin]['status'] = $status;
+
+        if ($status === Build::STATUS_RUNNING) {
+            $summary[$stage][$plugin]['started'] = time();
+        } elseif ($status >= Build::STATUS_SUCCESS) {
+            $summary[$stage][$plugin]['ended'] = time();
+        }
+
+        $this->setBuildSummary($summary);
+    }
+
+    /**
+     * Fetch the summary data of the current build.
+     *
+     * @return array
+     */
+    private function getBuildSummary()
+    {
+        $build = $this->pluginFactory->getResourceFor('PHPCI\Model\Build');
+        $metas = $this->store->getMeta('plugin-summary', $build->getProjectId(), $build->getId());
+        return isset($metas[0]['meta_value']) ? $metas[0]['meta_value'] : array();
+    }
+
+    /**
+     * Sets the summary data of the current build.
+     *
+     * @param array summary
+     */
+    private function setBuildSummary($summary)
+    {
+        $build = $this->pluginFactory->getResourceFor('PHPCI\Model\Build');
+        $this->store->setMeta($build->getProjectId(), $build->getId(), 'plugin-summary', json_encode($summary));
     }
 }
diff --git a/PHPCI/Plugin/Util/Factory.php b/PHPCI/Plugin/Util/Factory.php
index 76de2b7d..30c68340 100644
--- a/PHPCI/Plugin/Util/Factory.php
+++ b/PHPCI/Plugin/Util/Factory.php
@@ -150,11 +150,11 @@ class Factory
     }
 
     /**
-     * @param null $type
-     * @param null $name
-     * @return null
+     * @param string $type
+     * @param string $name
+     * @return mixed
      */
-    private function getResourceFor($type = null, $name = null)
+    public function getResourceFor($type = null, $name = null)
     {
         $fullId = $this->getInternalID($type, $name);
         if (isset($this->container[$fullId])) {
diff --git a/PHPCI/Store/BuildStore.php b/PHPCI/Store/BuildStore.php
index 7519a12f..9974c7b3 100644
--- a/PHPCI/Store/BuildStore.php
+++ b/PHPCI/Store/BuildStore.php
@@ -165,7 +165,9 @@ class BuildStore extends BuildStoreBase
         $stmt->bindValue(':projectId', (int)$projectId, \PDO::PARAM_INT);
         $stmt->bindValue(':buildId', (int)$buildId, \PDO::PARAM_INT);
         $stmt->bindValue(':numResults', (int)$numResults, \PDO::PARAM_INT);
-        $stmt->bindValue(':branch', $branch, \PDO::PARAM_STR);
+        if (!is_null($branch)) {
+            $stmt->bindValue(':branch', $branch, \PDO::PARAM_STR);
+        }
 
         if ($stmt->execute()) {
             $rtn = $stmt->fetchAll(\PDO::FETCH_ASSOC);
diff --git a/Tests/PHPCI/Plugin/Util/ExecutorTest.php b/Tests/PHPCI/Plugin/Util/ExecutorTest.php
index 8501f209..e9083cec 100644
--- a/Tests/PHPCI/Plugin/Util/ExecutorTest.php
+++ b/Tests/PHPCI/Plugin/Util/ExecutorTest.php
@@ -24,12 +24,19 @@ class ExecutorTest extends \PHPUnit_Framework_TestCase
 
     protected $mockFactory;
 
+    protected $mockStore;
+
     protected function setUp()
     {
         parent::setUp();
         $this->mockBuildLogger = $this->prophesize('\PHPCI\Logging\BuildLogger');
         $this->mockFactory = $this->prophesize('\PHPCI\Plugin\Util\Factory');
-        $this->testedExecutor = new Executor($this->mockFactory->reveal(), $this->mockBuildLogger->reveal());
+        $this->mockStore = $this->prophesize('\PHPCI\Store\BuildStore');
+        $this->testedExecutor = new Executor(
+            $this->mockFactory->reveal(),
+            $this->mockBuildLogger->reveal(),
+            $this->mockStore->reveal()
+        );
     }
 
     public function testExecutePlugin_AssumesPHPCINamespaceIfNoneGiven()
@@ -61,11 +68,13 @@ class ExecutorTest extends \PHPUnit_Framework_TestCase
     {
         $options = array();
         $pluginName = 'PhpUnit';
+        $build = new \PHPCI\Model\Build();
 
         $mockPlugin = $this->prophesize('PHPCI\Plugin');
         $mockPlugin->execute()->shouldBeCalledTimes(1);
 
         $this->mockFactory->buildPlugin(Argument::any(), Argument::any())->willReturn($mockPlugin->reveal());
+        $this->mockFactory->getResourceFor('PHPCI\Model\Build')->willReturn($build);
 
         $this->testedExecutor->executePlugin($pluginName, $options);
     }
@@ -119,6 +128,7 @@ class ExecutorTest extends \PHPUnit_Framework_TestCase
     {
         $phpUnitPluginOptions = array();
         $behatPluginOptions = array();
+        $build = new \PHPCI\Model\Build();
 
         $config = array(
            'stageOne' => array(
@@ -134,7 +144,7 @@ class ExecutorTest extends \PHPUnit_Framework_TestCase
 
         $this->mockFactory->buildPlugin($pluginNamespace . 'PhpUnit', $phpUnitPluginOptions)
                           ->willReturn($mockPhpUnitPlugin->reveal());
-
+        $this->mockFactory->getResourceFor('PHPCI\Model\Build')->willReturn($build);
 
         $mockBehatPlugin = $this->prophesize('PHPCI\Plugin');
         $mockBehatPlugin->execute()->shouldBeCalledTimes(1)->willReturn(true);
@@ -142,7 +152,6 @@ class ExecutorTest extends \PHPUnit_Framework_TestCase
         $this->mockFactory->buildPlugin($pluginNamespace . 'Behat', $behatPluginOptions)
                           ->willReturn($mockBehatPlugin->reveal());
 
-
         $this->testedExecutor->executePlugins($config, 'stageOne');
     }
 
diff --git a/public/assets/js/build-plugins/summary.js b/public/assets/js/build-plugins/summary.js
new file mode 100644
index 00000000..27b4ba2d
--- /dev/null
+++ b/public/assets/js/build-plugins/summary.js
@@ -0,0 +1,67 @@
+var SummaryPlugin = ActiveBuild.UiPlugin.extend({
+    id: 'build-summary',
+    css: 'col-lg-6 col-md-12 col-sm-12 col-xs-12',
+    title: Lang.get('build-summary'),
+    box: true,
+    statusIcons: [ 'fa-clock-o', 'fa-cogs', 'fa-check', 'fa-remove' ],
+    statusLabels: [ Lang.get('pending'), Lang.get('running'), Lang.get('successful'), Lang.get('failed') ],
+    statusClasses: ['text-blue', 'text-yellow', 'text-green', 'text-red'],
+
+    register: function() {
+        var self = this;
+        var query = ActiveBuild.registerQuery('plugin-summary', 5, {key: 'plugin-summary'})
+
+        $(window).on('plugin-summary', function(data) {
+            self.onUpdate(data);
+        });
+
+        $(window).on('build-updated', function() {
+            query();
+        });
+    },
+
+    render: function() {
+        return $(
+            '
    ' +
+            '' +
+                    '' +
+                    '' +
+                    '' +
+                    '' +
+            '
    '+Lang.get('stage')+''+Lang.get('plugin')+''+Lang.get('status')+''+Lang.get('duration')+' (s)
    '
+        );
+    },
+
+    onUpdate: function(e) {
+        if (!e.queryData) {
+            $('#build-summary').hide();
+            return;
+        }
+
+        var tbody = $('#plugin-summary tbody'),
+            summary = e.queryData[0].meta_value;
+        tbody.empty();
+
+        for(var stage in summary) {
+            for(var plugin in summary[stage]) {
+                var data = summary[stage][plugin],
+                    duration = data.started ? ((data.ended || Math.floor(Date.now()/1000)) - data.started) : '-';
+                tbody.append(
+                    '' +
+                        '' + Lang.get('stage_'+stage) + '' +
+                        '' + plugin + '' +
+                        '' +
+                            ' ' +
+                            this.statusLabels[data.status] +
+                        '' +
+                        '' + duration + '' +
+                    ''
+                );
+            }
+        }
+
+        $('#build-summary').show();
+    }
+});
+
+ActiveBuild.registerPlugin(new SummaryPlugin());

From 7ff080971ef74d99d51c7cc188f2d409d7e7e81f Mon Sep 17 00:00:00 2001
From: Petr Cervenka 
Date: Wed, 29 Apr 2015 11:51:00 +0800
Subject: [PATCH 211/329] Adding Flowdock integration

Closed #954
---
 PHPCI/Plugin/FlowdockNotify.php | 73 +++++++++++++++++++++++++++++++++
 composer.json                   |  3 +-
 2 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 PHPCI/Plugin/FlowdockNotify.php

diff --git a/PHPCI/Plugin/FlowdockNotify.php b/PHPCI/Plugin/FlowdockNotify.php
new file mode 100644
index 00000000..8ac9f2ab
--- /dev/null
+++ b/PHPCI/Plugin/FlowdockNotify.php
@@ -0,0 +1,73 @@
+
+ * @package      PHPCI
+ * @subpackage   Plugins
+ */
+class FlowdockNotify implements \PHPCI\Plugin
+{
+    private $api_key;
+    private $email;
+    const MESSAGE_DEFAULT = 'Build %BUILD% has finished for commit %SHORT_COMMIT%
+                            (%COMMIT_EMAIL%)> on branch %BRANCH%';
+
+    /**
+     * Set up the plugin, configure options, etc.
+     * @param Builder $phpci
+     * @param Build   $build
+     * @param array   $options
+     * @throws \Exception
+     */
+    public function __construct(Builder $phpci, Build $build, array $options = array())
+    {
+        $this->phpci = $phpci;
+        $this->build = $build;
+        if (!is_array($options) || !isset($options['api_key'])) {
+            throw new \Exception('Please define the api_key for Flowdock Notify plugin!');
+        }
+        $this->api_key = trim($options['api_key']);
+        $this->message = isset($options['message']) ? $options['message'] : self::MESSAGE_DEFAULT;
+        $this->email = isset($options['email']) ? $options['email'] : 'PHPCI';
+    }
+
+    /**
+     * Run the Flowdock plugin.
+     * @return bool
+     * @throws \Exception
+     */
+    public function execute()
+    {
+
+        $message = $this->phpci->interpolate($this->message);
+        $successfulBuild = $this->build->isSuccessful() ? 'Success' : 'Failed';
+        $push = new Push($this->api_key);
+        $flowMessage = TeamInboxMessage::create()
+            ->setSource("PHPCI")
+            ->setFromAddress($this->email)
+            ->setFromName($this->build->getProject()->getTitle())
+            ->setSubject($successfulBuild)
+            ->setTags(['#ci'])
+            ->setLink($this->build->getBranchLink())
+            ->setContent($message);
+
+        if (!$push->sendTeamInboxMessage($flowMessage, array('connect_timeout' => 5000, 'timeout' => 5000))) {
+            throw new \Exception(sprintf('Flowdock Failed: %s', $flowMessage->getResponseErrors()));
+        }
+        return true;
+    }
+}
diff --git a/composer.json b/composer.json
index eadd9a81..3de523e5 100644
--- a/composer.json
+++ b/composer.json
@@ -76,6 +76,7 @@
         "behat/behat": "Behat BDD Testing",
         "hipchat/hipchat-php": "Hipchat integration",
         "phptal/phptal": "PHPTAL templating engine",
-        "maknz/slack": "Slack integration"
+        "maknz/slack": "Slack integration",
+        "mremi/flowdock": "Flowdock integration"
     }
 }

From 5c6dd81a9a2f9401fab85c8884b771ba4aa50efa Mon Sep 17 00:00:00 2001
From: corpsee 
Date: Thu, 30 Apr 2015 16:07:12 +0600
Subject: [PATCH 212/329] Extended shields.io status badge support

Closed #958
---
 PHPCI/Controller/BuildStatusController.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/PHPCI/Controller/BuildStatusController.php b/PHPCI/Controller/BuildStatusController.php
index 62442bf8..0090e85f 100644
--- a/PHPCI/Controller/BuildStatusController.php
+++ b/PHPCI/Controller/BuildStatusController.php
@@ -131,6 +131,9 @@ class BuildStatusController extends \PHPCI\Controller
     */
     public function image($projectId)
     {
+        $style = $this->getParam('style', 'plastic');
+        $label = $this->getParam('label', 'build');
+
         $status = $this->getStatus($projectId);
 
         if (is_null($status)) {
@@ -140,7 +143,13 @@ class BuildStatusController extends \PHPCI\Controller
         }
 
         $color = ($status == 'passing') ? 'green' : 'red';
-        $image = file_get_contents('http://img.shields.io/badge/build-' . $status . '-' . $color . '.svg');
+        $image = file_get_contents(sprintf(
+            'http://img.shields.io/badge/%s-%s-%s.svg?style=%s',
+            $label,
+            $status,
+            $color,
+            $style
+        ));
 
         $this->response->disableLayout();
         $this->response->setHeader('Content-Type', 'image/svg+xml');

From b7d9af1e7292ee74ee55b8bf2cfef689429dce0b Mon Sep 17 00:00:00 2001
From: Adirelle 
Date: Tue, 5 May 2015 10:33:33 +0200
Subject: [PATCH 213/329] Update sensiolabs/ansi-to-html to fix the log
 background.

Closed #961
---
 composer.lock | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/composer.lock b/composer.lock
index dbbedd22..21e42d42 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "a4a95f2b83e336b9e1b285c04af26ce7",
+    "hash": "0be92d5565a805ffe462c6061ed1dcf4",
     "packages": [
         {
             "name": "block8/b8framework",
@@ -219,12 +219,12 @@
             "version": "v1.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/silexphp/Pimple.git",
+                "url": "https://github.com/fabpot/Pimple.git",
                 "reference": "2019c145fe393923f3441b23f29bbdfaa5c58c4d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/silexphp/Pimple/zipball/2019c145fe393923f3441b23f29bbdfaa5c58c4d",
+                "url": "https://api.github.com/repos/fabpot/Pimple/zipball/2019c145fe393923f3441b23f29bbdfaa5c58c4d",
                 "reference": "2019c145fe393923f3441b23f29bbdfaa5c58c4d",
                 "shasum": ""
             },
@@ -249,7 +249,9 @@
             "authors": [
                 {
                     "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
+                    "email": "fabien@symfony.com",
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
                 }
             ],
             "description": "Pimple is a simple Dependency Injection Container for PHP 5.3",
@@ -362,16 +364,16 @@
         },
         {
             "name": "sensiolabs/ansi-to-html",
-            "version": "v1.1.0",
+            "version": "v1.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sensiolabs/ansi-to-html.git",
-                "reference": "92d2ef7ffba5418be060d8ba8adaf7223d741f93"
+                "reference": "fd0aa98170e12131ab989c39252df076cff60121"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sensiolabs/ansi-to-html/zipball/92d2ef7ffba5418be060d8ba8adaf7223d741f93",
-                "reference": "92d2ef7ffba5418be060d8ba8adaf7223d741f93",
+                "url": "https://api.github.com/repos/sensiolabs/ansi-to-html/zipball/fd0aa98170e12131ab989c39252df076cff60121",
+                "reference": "fd0aa98170e12131ab989c39252df076cff60121",
                 "shasum": ""
             },
             "require": {
@@ -402,7 +404,7 @@
                 }
             ],
             "description": "A library to convert a text with ANSI codes to HTML",
-            "time": "2014-08-01 14:02:39"
+            "time": "2015-03-17 06:34:10"
         },
         {
             "name": "swiftmailer/swiftmailer",

From 3734d3bc9a6b99354b188d08db2f64176c228d70 Mon Sep 17 00:00:00 2001
From: Adirelle 
Date: Tue, 5 May 2015 10:36:33 +0200
Subject: [PATCH 214/329] Don't use an if and two return statements when one
 return is sufficient. Don't use two if when one else does the same job. Don't
 use convoluted calculations when one return statement is sufficient. Don't
 call a method that doesn't exist. Don't write a try-catch block that does
 nothing. Do send exceptions when a abnormal situation occurs.

Closed #962
---
 PHPCI/Plugin/Codeception.php | 99 +++++++++++++++---------------------
 1 file changed, 40 insertions(+), 59 deletions(-)

diff --git a/PHPCI/Plugin/Codeception.php b/PHPCI/Plugin/Codeception.php
index fe12db76..bba9b48b 100644
--- a/PHPCI/Plugin/Codeception.php
+++ b/PHPCI/Plugin/Codeception.php
@@ -52,11 +52,7 @@ class Codeception implements \PHPCI\Plugin, \PHPCI\ZeroConfigPlugin
      */
     public static function canExecute($stage, Builder $builder, Build $build)
     {
-        if ($stage == 'test' && !is_null(self::findConfigFile($builder->buildPath))) {
-            return true;
-        }
-
-        return false;
+        return $stage == 'test' && !is_null(self::findConfigFile($builder->buildPath));
     }
 
     /**
@@ -91,8 +87,7 @@ class Codeception implements \PHPCI\Plugin, \PHPCI\ZeroConfigPlugin
 
         if (empty($options['config'])) {
             $this->ymlConfigFile = self::findConfigFile($this->phpci->buildPath);
-        }
-        if (isset($options['config'])) {
+        } else {
             $this->ymlConfigFile = $options['config'];
         }
         if (isset($options['args'])) {
@@ -109,16 +104,11 @@ class Codeception implements \PHPCI\Plugin, \PHPCI\ZeroConfigPlugin
     public function execute()
     {
         if (empty($this->ymlConfigFile)) {
-            $this->phpci->logFailure('No configuration file found');
-            return false;
+            throw new \Exception("No configuration file found");
         }
 
-        $success = true;
-
         // Run any config files first. This can be either a single value or an array.
-        $success &= $this->runConfigFile($this->ymlConfigFile);
-
-        return $success;
+        return $this->runConfigFile($this->ymlConfigFile);
     }
 
     /**
@@ -129,54 +119,45 @@ class Codeception implements \PHPCI\Plugin, \PHPCI\ZeroConfigPlugin
      */
     protected function runConfigFile($configPath)
     {
-        if (is_array($configPath)) {
-            return $this->recurseArg($configPath, array($this, 'runConfigFile'));
-        } else {
-            $this->phpci->logExecOutput(false);
+        $this->phpci->logExecOutput(false);
 
-            $codecept = $this->phpci->findBinary('codecept');
+        $codecept = $this->phpci->findBinary('codecept');
 
-            if (!$codecept) {
-                $this->phpci->logFailure(Lang::get('could_not_find', 'codecept'));
+        if (!$codecept) {
+            $this->phpci->logFailure(Lang::get('could_not_find', 'codecept'));
 
-                return false;
-            }
-
-            $cmd = 'cd "%s" && ' . $codecept . ' run -c "%s" --xml ' . $this->args;
-            if (IS_WIN) {
-                $cmd = 'cd /d "%s" && ' . $codecept . ' run -c "%s" --xml ' . $this->args;
-            }
-
-            $configPath = $this->phpci->buildPath . $configPath;
-            $success = $this->phpci->executeCommand($cmd, $this->phpci->buildPath, $configPath);
-
-
-            $this->phpci->log(
-                'Codeception XML path: '. $this->phpci->buildPath . $this->path . '_output/report.xml',
-                Loglevel::DEBUG
-            );
-            $xml = file_get_contents($this->phpci->buildPath . $this->path . '_output/report.xml', false);
-
-            try {
-                $parser = new Parser($this->phpci, $xml);
-                $output = $parser->parse();
-            } catch (\Exception $ex) {
-                throw $ex;
-            }
-
-            $meta = array(
-                'tests' => $parser->getTotalTests(),
-                'timetaken' => $parser->getTotalTimeTaken(),
-                'failures' => $parser->getTotalFailures()
-            );
-
-            $this->build->storeMeta('codeception-meta', $meta);
-            $this->build->storeMeta('codeception-data', $output);
-            $this->build->storeMeta('codeception-errors', $parser->getTotalFailures());
-
-            $this->phpci->logExecOutput(true);
-
-            return $success;
+            return false;
         }
+
+        $cmd = 'cd "%s" && ' . $codecept . ' run -c "%s" --xml ' . $this->args;
+        if (IS_WIN) {
+            $cmd = 'cd /d "%s" && ' . $codecept . ' run -c "%s" --xml ' . $this->args;
+        }
+
+        $configPath = $this->phpci->buildPath . $configPath;
+        $success = $this->phpci->executeCommand($cmd, $this->phpci->buildPath, $configPath);
+
+        $reportPath = $this->phpci->buildPath . $this->path . '_output/report.xml';
+        if (!file_exists($reportPath)) {
+            throw new \Exception("Cannot find Codeception XML report: $reportPath");
+        }
+        $xml = file_get_contents($reportPath, false);
+
+        $parser = new Parser($this->phpci, $xml);
+        $output = $parser->parse();
+
+        $meta = array(
+            'tests' => $parser->getTotalTests(),
+            'timetaken' => $parser->getTotalTimeTaken(),
+            'failures' => $parser->getTotalFailures()
+        );
+
+        $this->build->storeMeta('codeception-meta', $meta);
+        $this->build->storeMeta('codeception-data', $output);
+        $this->build->storeMeta('codeception-errors', $parser->getTotalFailures());
+
+        $this->phpci->logExecOutput(true);
+
+        return $success;
     }
 }

From 1eb5248319eafe03613245a592c447470995937d Mon Sep 17 00:00:00 2001
From: Stephen Ball 
Date: Thu, 14 May 2015 13:19:55 +0100
Subject: [PATCH 215/329] Removed allowed_warnings as it is not used Calling
 setOptions

Closed #975
---
 PHPCI/Plugin/TechnicalDebt.php | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/PHPCI/Plugin/TechnicalDebt.php b/PHPCI/Plugin/TechnicalDebt.php
index eca05213..163c94c6 100755
--- a/PHPCI/Plugin/TechnicalDebt.php
+++ b/PHPCI/Plugin/TechnicalDebt.php
@@ -42,11 +42,6 @@ class TechnicalDebt implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
      */
     protected $allowed_errors;
 
-    /**
-     * @var int
-     */
-    protected $allowed_warnings;
-
     /**
      * @var string, based on the assumption the root may not hold the code to be
      * tested, extends the base path
@@ -94,7 +89,6 @@ class TechnicalDebt implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
         $this->directory = $phpci->buildPath;
         $this->path = '';
         $this->ignore = $this->phpci->ignore;
-        $this->allowed_warnings = 0;
         $this->allowed_errors = 0;
         $this->searches = array('TODO', 'FIXME', 'TO DO', 'FIX ME');
 
@@ -103,9 +97,10 @@ class TechnicalDebt implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
         }
 
         if (isset($options['zero_config']) && $options['zero_config']) {
-            $this->allowed_warnings = -1;
             $this->allowed_errors = -1;
         }
+
+        $this->setOptions($options);
     }
 
     /**
@@ -114,7 +109,7 @@ class TechnicalDebt implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
      */
     protected function setOptions($options)
     {
-        foreach (array('directory', 'path', 'ignore', 'allowed_warnings', 'allowed_errors') as $key) {
+        foreach (array('directory', 'path', 'ignore', 'allowed_errors') as $key) {
             if (array_key_exists($key, $options)) {
                 $this->{$key} = $options[$key];
             }

From d34818f029ff92eda3ea5b6a5a67a67bee363173 Mon Sep 17 00:00:00 2001
From: mulleto 
Date: Sat, 16 May 2015 19:04:57 +0200
Subject: [PATCH 216/329] Added missing strings in german translation

Closed #982
---
 PHPCI/Languages/lang.de.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/PHPCI/Languages/lang.de.php b/PHPCI/Languages/lang.de.php
index 8a08e37d..f866a4de 100644
--- a/PHPCI/Languages/lang.de.php
+++ b/PHPCI/Languages/lang.de.php
@@ -102,7 +102,8 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab
     'remote' => 'Externe URL',
     'local' => 'Lokaler Pfad',
     'hg'    => 'Mercurial',
-
+    'svn'   => 'Subversion',
+    
     'where_hosted' => 'Wo wird Ihr Projekt gehostet?',
     'choose_github' => 'Wählen Sie ein GitHub Repository:',
 
@@ -183,7 +184,15 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab
     'phpmd' => 'PHP Mess Detector',
     'phpspec' => 'PHP Spec',
     'phpunit' => 'PHP Unit',
+    'technical_debt' => 'Technische Schulden',
+    'behat' => 'Behat',
 
+    'codeception_feature' => 'Feature',
+    'codeception_suite' => 'Suite',
+    'codeception_time' => 'Zeit',
+    'codeception_synopsis' => '%1$d Tests in %2$f Sekunden ausgeführt.
+                               %3$d Fehler.',    
+    
     'file' => 'Datei',
     'line' => 'Zeile',
     'class' => 'Klasse',

From 3784cc8ea905816ad45120ee58050859af44536d Mon Sep 17 00:00:00 2001
From: mulleto 
Date: Thu, 21 May 2015 14:23:06 +0200
Subject: [PATCH 217/329] Adding an option for Plugin::Composer to pass the
 no_dev option. If set to true, it will execute composer with the --no-dev
 option, which usually suffices for testing in most projects. Default is set
 to false.

Closed #987
---
 PHPCI/Plugin/Composer.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/PHPCI/Plugin/Composer.php b/PHPCI/Plugin/Composer.php
index 87a558fe..38cf4d0e 100644
--- a/PHPCI/Plugin/Composer.php
+++ b/PHPCI/Plugin/Composer.php
@@ -27,6 +27,7 @@ class Composer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
     protected $preferDist;
     protected $phpci;
     protected $build;
+    protected $nodev;
 
     /**
      * Check if this plugin can be executed.
@@ -60,6 +61,7 @@ class Composer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
         $this->directory = $path;
         $this->action = 'install';
         $this->preferDist = false;
+        $this->nodev = false;
 
         if (array_key_exists('directory', $options)) {
             $this->directory = $path . '/' . $options['directory'];
@@ -72,6 +74,10 @@ class Composer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
         if (array_key_exists('prefer_dist', $options)) {
             $this->preferDist = (bool)$options['prefer_dist'];
         }
+
+        if (array_key_exists('no_dev', $options)) {
+            $this->nodev = (bool)$options['no_dev'];
+        }
     }
 
     /**
@@ -97,6 +103,11 @@ class Composer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
             $cmd .= '--prefer-source';
         }
 
+        if ($this->nodev) {
+            $this->phpci->log('Using --no-dev flag');
+            $cmd .= ' --no-dev';
+        }
+
         $cmd .= ' --working-dir="%s" %s';
 
         return $this->phpci->executeCommand($cmd, $this->directory, $this->action);

From 9ace15a55f4bb4c16bb1b84ab24a679692bb100f Mon Sep 17 00:00:00 2001
From: tankist 
Date: Fri, 22 May 2015 11:49:48 +0300
Subject: [PATCH 218/329] Fix for #988 Added class::method fallback for feature
 entry to prevent empty report for Codeception plugin

Closed #989
---
 PHPCI/Plugin/Util/TestResultParsers/Codeception.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/PHPCI/Plugin/Util/TestResultParsers/Codeception.php b/PHPCI/Plugin/Util/TestResultParsers/Codeception.php
index 39f1ce6f..249579be 100644
--- a/PHPCI/Plugin/Util/TestResultParsers/Codeception.php
+++ b/PHPCI/Plugin/Util/TestResultParsers/Codeception.php
@@ -62,6 +62,11 @@ class Codeception implements ParserInterface
                     $testresult['class'] = (string) $testcase['class'];
                 }
 
+                // PHPUnit testcases does not have feature field. Use class::method instead
+                if (!$testresult['feature']) {
+                    $testresult['feature'] = sprintf('%s::%s', $testresult['class'], $testresult['name']);
+                }
+
                 if (isset($testcase->failure)) {
                     $testresult['pass'] = false;
                     $testresult['message'] = (string) $testcase->failure;

From 3a6008db53e6a8fe38b19deed65f2c182896a791 Mon Sep 17 00:00:00 2001
From: Aleix Canal 
Date: Fri, 22 May 2015 14:53:44 +0200
Subject: [PATCH 219/329] Bugfix: Default codeception xml path "tests/_output/"
 but now 100% configurable.

Closed #991
---
 PHPCI/Plugin/Codeception.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/PHPCI/Plugin/Codeception.php b/PHPCI/Plugin/Codeception.php
index bba9b48b..b906fb70 100644
--- a/PHPCI/Plugin/Codeception.php
+++ b/PHPCI/Plugin/Codeception.php
@@ -83,7 +83,7 @@ class Codeception implements \PHPCI\Plugin, \PHPCI\ZeroConfigPlugin
     {
         $this->phpci = $phpci;
         $this->build = $build;
-        $this->path = 'tests/';
+        $this->path = 'tests/_output/';
 
         if (empty($options['config'])) {
             $this->ymlConfigFile = self::findConfigFile($this->phpci->buildPath);
@@ -137,11 +137,13 @@ class Codeception implements \PHPCI\Plugin, \PHPCI\ZeroConfigPlugin
         $configPath = $this->phpci->buildPath . $configPath;
         $success = $this->phpci->executeCommand($cmd, $this->phpci->buildPath, $configPath);
 
-        $reportPath = $this->phpci->buildPath . $this->path . '_output/report.xml';
-        if (!file_exists($reportPath)) {
-            throw new \Exception("Cannot find Codeception XML report: $reportPath");
-        }
-        $xml = file_get_contents($reportPath, false);
+
+            $this->phpci->log(
+                'Codeception XML path: '. $this->phpci->buildPath . $this->path . 'report.xml',
+                Loglevel::DEBUG
+            );
+            $xml = file_get_contents($this->phpci->buildPath . $this->path . 'report.xml', false);
+
 
         $parser = new Parser($this->phpci, $xml);
         $output = $parser->parse();

From 2672908225679aeefb3cba8a1ba353c12e9face7 Mon Sep 17 00:00:00 2001
From: mulleto 
Date: Fri, 29 May 2015 08:26:47 +0200
Subject: [PATCH 220/329] Make check for Pdepend output dir more robust. Before
 this fix, the pdepend module would check for "is_writable", which returns
 false even when the directory does not exist. I suggest to a) attempt to
 crete the dir if it does not exist, and b) make the error message more
 explanatory in case the dir cannot be created or is not accessible.

---
 PHPCI/Plugin/Pdepend.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/PHPCI/Plugin/Pdepend.php b/PHPCI/Plugin/Pdepend.php
index 73b669c1..faef406d 100644
--- a/PHPCI/Plugin/Pdepend.php
+++ b/PHPCI/Plugin/Pdepend.php
@@ -73,8 +73,11 @@ class Pdepend implements \PHPCI\Plugin
      */
     public function execute()
     {
+        if (!file_exists($this->location)) {
+            mkdir($this->location);
+        }
         if (!is_writable($this->location)) {
-            throw new \Exception(sprintf('The location %s is not writable.', $this->location));
+            throw new \Exception(sprintf('The location %s is not writable or does not exist.', $this->location));
         }
 
         $pdepend = $this->phpci->findBinary('pdepend');

From d698b11673d69b5d6b3df03d21f2c00ed2f67b56 Mon Sep 17 00:00:00 2001
From: Adirelle 
Date: Tue, 26 May 2015 08:46:49 +0200
Subject: [PATCH 221/329] Fixes "Undefined index: login_token".

Fixes https://github.com/Block8/PHPCI/issues/994.
---
 PHPCI/Controller/SessionController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PHPCI/Controller/SessionController.php b/PHPCI/Controller/SessionController.php
index a5f40ffb..2995c514 100644
--- a/PHPCI/Controller/SessionController.php
+++ b/PHPCI/Controller/SessionController.php
@@ -44,7 +44,7 @@ class SessionController extends \PHPCI\Controller
 
         if ($this->request->getMethod() == 'POST') {
             $token = $this->getParam('token');
-            if ($token === null || $token !== $_SESSION['login_token']) {
+            if (!isset($token, $_SESSION['login_token']) || $token !== $_SESSION['login_token']) {
                 $isLoginFailure = true;
             } else {
                 unset($_SESSION['login_token']);

From 9efd8e06dc23bda7102058e4a1f29bb72f8335ab Mon Sep 17 00:00:00 2001
From: Joe Huss 
Date: Thu, 25 Jun 2015 07:48:26 -0400
Subject: [PATCH 222/329] Contribution Type: improvement / new feature Primary
 Area: plugins

Description of change: Implemented using the same changes mentioned here: https://www.phptesting.org/forums/topic/5-mysql-plugin-setup/
Allows you to specify a hostname for your mysql connection.  Not my original code just patching it into the current source and made a branchs/push for it.

(i.e. Created a new plugin named ToolX, used library X to implement, see link)
---
 PHPCI/Plugin/Mysql.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/PHPCI/Plugin/Mysql.php b/PHPCI/Plugin/Mysql.php
index 5c36a09f..fdb521ef 100644
--- a/PHPCI/Plugin/Mysql.php
+++ b/PHPCI/Plugin/Mysql.php
@@ -166,10 +166,11 @@ class Mysql implements \PHPCI\Plugin
         $args = array(
             ':import_file' => escapeshellarg($import_file),
             ':decomp_cmd' => $decomp_cmd,
+            ':host' => escapeshellarg($this->host),
             ':user' => escapeshellarg($this->user),
             ':pass' => escapeshellarg($this->pass),
             ':database' => ($database === null)? '': escapeshellarg($database),
         );
-        return strtr('cat :import_file :decomp_cmd | mysql -u:user -p:pass :database', $args);
+        return strtr('cat :import_file :decomp_cmd | mysql -h:host -u:user -p:pass :database', $args);
     }
 }

From d2c512d94b32a230234a8e829f307a45933d3f5d Mon Sep 17 00:00:00 2001
From: Mark Robinson 
Date: Thu, 25 Jun 2015 15:21:23 +0100
Subject: [PATCH 223/329] Corrected a number of minor spelling errors.

Originally observed that "successful" was misspelled "succesfull" on the build view page. While correcting that, a number of other spelling errors were also corrected.
---
 PHPCI/Controller/WebhookController.php                 | 2 +-
 PHPCI/Helper/AnsiConverter.php                         | 6 +++---
 PHPCI/Helper/LoginIsDisabled.php                       | 2 +-
 PHPCI/Languages/lang.da.php                            | 2 +-
 PHPCI/Languages/lang.de.php                            | 2 +-
 PHPCI/Languages/lang.el.php                            | 2 +-
 PHPCI/Languages/lang.en.php                            | 2 +-
 PHPCI/Languages/lang.it.php                            | 2 +-
 PHPCI/Languages/lang.nl.php                            | 2 +-
 PHPCI/Languages/lang.pl.php                            | 2 +-
 PHPCI/Languages/lang.ru.php                            | 2 +-
 PHPCI/Languages/lang.uk.php                            | 2 +-
 PHPCI/Plugin/Email.php                                 | 2 +-
 PHPCI/Plugin/PhpCpd.php                                | 2 +-
 PHPCI/Plugin/PhpMessDetector.php                       | 4 ++--
 PHPCI/Plugin/Util/TapParser.php                        | 4 ++--
 PHPCI/ProcessControl/PosixProcessControl.php           | 2 +-
 Tests/PHPCI/Command/CreateBuildCommandTest.php         | 2 +-
 Tests/PHPCI/Command/InstallCommandTest.php             | 4 ++--
 Tests/PHPCI/Plugin/EmailTest.php                       | 4 ++--
 Tests/PHPCI/Plugin/Util/FilesPluginInformationTest.php | 2 +-
 bootstrap.php                                          | 2 +-
 22 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/PHPCI/Controller/WebhookController.php b/PHPCI/Controller/WebhookController.php
index 45a775ad..5848e961 100644
--- a/PHPCI/Controller/WebhookController.php
+++ b/PHPCI/Controller/WebhookController.php
@@ -170,7 +170,7 @@ class WebhookController extends \b8\Controller
     protected function githubCommitRequest(Project $project, array $payload)
     {
         // Github sends a payload when you close a pull request with a
-        // non-existant commit. We don't want this.
+        // non-existent commit. We don't want this.
         if (array_key_exists('after', $payload) && $payload['after'] === '0000000000000000000000000000000000000000') {
             return array('status' => 'ignored');
         }
diff --git a/PHPCI/Helper/AnsiConverter.php b/PHPCI/Helper/AnsiConverter.php
index a5e42269..7df6663c 100644
--- a/PHPCI/Helper/AnsiConverter.php
+++ b/PHPCI/Helper/AnsiConverter.php
@@ -21,7 +21,7 @@ final class AnsiConverter
     static private $converter = null;
 
     /**
-     * Initialize the singletion.
+     * Initialize the singleton.
      *
      * @return AnsiToHtmlConverter
      */
@@ -35,7 +35,7 @@ final class AnsiConverter
     }
 
     /**
-     * Convert a text containing ANSI colr sequences into HTML code.
+     * Convert a text containing ANSI color sequences into HTML code.
      *
      * @param string $text The text to convert
      *
@@ -47,7 +47,7 @@ final class AnsiConverter
     }
 
     /**
-     * Do not instanciate this class.
+     * Do not instantiate this class.
      */
     private function __construct()
     {
diff --git a/PHPCI/Helper/LoginIsDisabled.php b/PHPCI/Helper/LoginIsDisabled.php
index 437b95cd..ec23858c 100644
--- a/PHPCI/Helper/LoginIsDisabled.php
+++ b/PHPCI/Helper/LoginIsDisabled.php
@@ -12,7 +12,7 @@ namespace PHPCI\Helper;
 use b8\Config;
 
 /**
-* Login Is Disabled Helper - Checks if login is disalbed in the view
+* Login Is Disabled Helper - Checks if login is disabled in the view
 * @author       Stephen Ball 
 * @package      PHPCI
 * @subpackage   Web
diff --git a/PHPCI/Languages/lang.da.php b/PHPCI/Languages/lang.da.php
index 20e403e1..c5001b52 100644
--- a/PHPCI/Languages/lang.da.php
+++ b/PHPCI/Languages/lang.da.php
@@ -203,7 +203,7 @@ Services sektionen under dit Bitbucket-repository.',
     'build_finished' => 'Build Afsluttet',
     'test_message' => 'Message',
     'test_no_message' => 'No message',
-    'test_success' => 'Succesfull: %d',
+    'test_success' => 'Successful: %d',
     'test_fail' => 'Failures: %d',
     'test_skipped' => 'Skipped: %d',
     'test_error' => 'Errors: %d',
diff --git a/PHPCI/Languages/lang.de.php b/PHPCI/Languages/lang.de.php
index f866a4de..3539d6d1 100644
--- a/PHPCI/Languages/lang.de.php
+++ b/PHPCI/Languages/lang.de.php
@@ -210,7 +210,7 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab
     'build_finished' => 'Build abgeschlossen',
     'test_message' => 'Message',
     'test_no_message' => 'No message',
-    'test_success' => 'Succesfull: %d',
+    'test_success' => 'Successful: %d',
     'test_fail' => 'Failures: %d',
     'test_skipped' => 'Skipped: %d',
     'test_error' => 'Errors: %d',
diff --git a/PHPCI/Languages/lang.el.php b/PHPCI/Languages/lang.el.php
index cb7d169f..5021ec16 100644
--- a/PHPCI/Languages/lang.el.php
+++ b/PHPCI/Languages/lang.el.php
@@ -204,7 +204,7 @@ Services του Bitbucket αποθετηρίου σας.',
     'build_finished' => 'Η κατασκευή ολοκληρώθηκε',
     'test_message' => 'Message',
     'test_no_message' => 'No message',
-    'test_success' => 'Succesfull: %d',
+    'test_success' => 'Successful: %d',
     'test_fail' => 'Failures: %d',
     'test_skipped' => 'Skipped: %d',
     'test_error' => 'Errors: %d',
diff --git a/PHPCI/Languages/lang.en.php b/PHPCI/Languages/lang.en.php
index 9729d746..223db7e2 100644
--- a/PHPCI/Languages/lang.en.php
+++ b/PHPCI/Languages/lang.en.php
@@ -213,7 +213,7 @@ PHPCI',
     'build_finished' => 'Build Finished',
     'test_message' => 'Message',
     'test_no_message' => 'No message',
-    'test_success' => 'Succesfull: %d',
+    'test_success' => 'Successful: %d',
     'test_fail' => 'Failures: %d',
     'test_skipped' => 'Skipped: %d',
     'test_error' => 'Errors: %d',
diff --git a/PHPCI/Languages/lang.it.php b/PHPCI/Languages/lang.it.php
index ff326d14..e268172b 100644
--- a/PHPCI/Languages/lang.it.php
+++ b/PHPCI/Languages/lang.it.php
@@ -206,7 +206,7 @@ PHPCI',
     'build_finished' => 'Build Terminata',
     'test_message' => 'Message',
     'test_no_message' => 'No message',
-    'test_success' => 'Succesfull: %d',
+    'test_success' => 'Successful: %d',
     'test_fail' => 'Failures: %d',
     'test_skipped' => 'Skipped: %d',
     'test_error' => 'Errors: %d',
diff --git a/PHPCI/Languages/lang.nl.php b/PHPCI/Languages/lang.nl.php
index e0638aaf..a39ec4d7 100644
--- a/PHPCI/Languages/lang.nl.php
+++ b/PHPCI/Languages/lang.nl.php
@@ -204,7 +204,7 @@ Services sectie van je Bitbucket repository toegevoegd worden.',
     'build_finished' => 'Build beëindigd',
     'test_message' => 'Message',
     'test_no_message' => 'No message',
-    'test_success' => 'Succesfull: %d',
+    'test_success' => 'Successful: %d',
     'test_fail' => 'Failures: %d',
     'test_skipped' => 'Skipped: %d',
     'test_error' => 'Errors: %d',
diff --git a/PHPCI/Languages/lang.pl.php b/PHPCI/Languages/lang.pl.php
index d6f95ad6..baec665d 100644
--- a/PHPCI/Languages/lang.pl.php
+++ b/PHPCI/Languages/lang.pl.php
@@ -207,7 +207,7 @@ Services repozytoria Bitbucket.',
     'build_finished' => 'Budowanie Zakończone',
     'test_message' => 'Message',
     'test_no_message' => 'No message',
-    'test_success' => 'Succesfull: %d',
+    'test_success' => 'Successful: %d',
     'test_fail' => 'Failures: %d',
     'test_skipped' => 'Skipped: %d',
     'test_error' => 'Errors: %d',
diff --git a/PHPCI/Languages/lang.ru.php b/PHPCI/Languages/lang.ru.php
index aa0f40fb..aaf4cddf 100644
--- a/PHPCI/Languages/lang.ru.php
+++ b/PHPCI/Languages/lang.ru.php
@@ -202,7 +202,7 @@ PHPCI',
     'build_finished' => 'Сборка окончена',
     'test_message' => 'Message',
     'test_no_message' => 'No message',
-    'test_success' => 'Succesfull: %d',
+    'test_success' => 'Successful: %d',
     'test_fail' => 'Failures: %d',
     'test_skipped' => 'Skipped: %d',
     'test_error' => 'Errors: %d',
diff --git a/PHPCI/Languages/lang.uk.php b/PHPCI/Languages/lang.uk.php
index a3ca1b37..5efd226e 100644
--- a/PHPCI/Languages/lang.uk.php
+++ b/PHPCI/Languages/lang.uk.php
@@ -204,7 +204,7 @@ PHPCI',
     'build_finished' => 'Збірка завершена',
     'test_message' => 'Message',
     'test_no_message' => 'No message',
-    'test_success' => 'Succesfull: %d',
+    'test_success' => 'Successful: %d',
     'test_fail' => 'Failures: %d',
     'test_skipped' => 'Skipped: %d',
     'test_error' => 'Errors: %d',
diff --git a/PHPCI/Plugin/Email.php b/PHPCI/Plugin/Email.php
index c2638860..8faa5bb7 100644
--- a/PHPCI/Plugin/Email.php
+++ b/PHPCI/Plugin/Email.php
@@ -134,7 +134,7 @@ class Email implements \PHPCI\Plugin
      * Send an email to a list of specified subjects.
      *
      * @param array $toAddresses
-     *   List of destinatary of message.
+     *   List of destination addresses for message.
      * @param string $subject
      *   Mail subject
      * @param string $body
diff --git a/PHPCI/Plugin/PhpCpd.php b/PHPCI/Plugin/PhpCpd.php
index 6433308f..953c3ea7 100644
--- a/PHPCI/Plugin/PhpCpd.php
+++ b/PHPCI/Plugin/PhpCpd.php
@@ -28,7 +28,7 @@ class PhpCpd implements \PHPCI\Plugin
 
     /**
      * @var string, based on the assumption the root may not hold the code to be
-     * tested, exteds the base path
+     * tested, extends the base path
      */
     protected $path;
 
diff --git a/PHPCI/Plugin/PhpMessDetector.php b/PHPCI/Plugin/PhpMessDetector.php
index b02f5f09..4d075fda 100644
--- a/PHPCI/Plugin/PhpMessDetector.php
+++ b/PHPCI/Plugin/PhpMessDetector.php
@@ -38,7 +38,7 @@ class PhpMessDetector implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
 
     /**
      * @var string, based on the assumption the root may not hold the code to be
-     * tested, exteds the base path only if the provided path is relative. Absolute
+     * tested, extends the base path only if the provided path is relative. Absolute
      * paths are used verbatim
      */
     protected $path;
@@ -50,7 +50,7 @@ class PhpMessDetector implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
 
     /**
      * Array of PHPMD rules. Can be one of the builtins (codesize, unusedcode, naming, design, controversial)
-     * or a filenname (detected by checking for a / in it), either absolute or relative to the project root.
+     * or a filename (detected by checking for a / in it), either absolute or relative to the project root.
      * @var array
      */
     protected $rules;
diff --git a/PHPCI/Plugin/Util/TapParser.php b/PHPCI/Plugin/Util/TapParser.php
index 18772a6a..8d3ec382 100644
--- a/PHPCI/Plugin/Util/TapParser.php
+++ b/PHPCI/Plugin/Util/TapParser.php
@@ -73,7 +73,7 @@ class TapParser
 
         $line = $this->nextLine();
         if ($line === $header) {
-            throw new Exception("Duplicated TAP log, please check the configration.");
+            throw new Exception("Duplicated TAP log, please check the configuration.");
         }
 
         while ($line !== false && ($this->testCount === false || count($this->results) < $this->testCount)) {
@@ -96,7 +96,7 @@ class TapParser
      */
     protected function findTapLog()
     {
-        // Look for the beggning of the TAP output
+        // Look for the beginning of the TAP output
         do {
             $header = $this->nextLine();
         } while ($header !== false && substr($header, 0, 12) !== 'TAP version ');
diff --git a/PHPCI/ProcessControl/PosixProcessControl.php b/PHPCI/ProcessControl/PosixProcessControl.php
index 710ba9f1..bac55ee2 100644
--- a/PHPCI/ProcessControl/PosixProcessControl.php
+++ b/PHPCI/ProcessControl/PosixProcessControl.php
@@ -31,7 +31,7 @@ class PosixProcessControl implements ProcessControlInterface
      * Sends a TERMINATE or KILL signal to the process using posix_kill.
      *
      * @param int $pid
-     * @param bool $forcefully Whetehr to send TERMINATE (false) or KILL (true).
+     * @param bool $forcefully Whether to send TERMINATE (false) or KILL (true).
      */
     public function kill($pid, $forcefully = false)
     {
diff --git a/Tests/PHPCI/Command/CreateBuildCommandTest.php b/Tests/PHPCI/Command/CreateBuildCommandTest.php
index 59395de5..e82ae517 100644
--- a/Tests/PHPCI/Command/CreateBuildCommandTest.php
+++ b/Tests/PHPCI/Command/CreateBuildCommandTest.php
@@ -78,7 +78,7 @@ class CreateBuildCommandTest extends \PHPUnit_Framework_TestCase
     /**
      * @expectedException \InvalidArgumentException
      */
-    public function testExecuteWithUnknowProjectId()
+    public function testExecuteWithUnknownProjectId()
     {
         $commandTester = $this->getCommandTester();
         $commandTester->execute(array('projectId' => 2));
diff --git a/Tests/PHPCI/Command/InstallCommandTest.php b/Tests/PHPCI/Command/InstallCommandTest.php
index 73b83462..040a4803 100644
--- a/Tests/PHPCI/Command/InstallCommandTest.php
+++ b/Tests/PHPCI/Command/InstallCommandTest.php
@@ -175,7 +175,7 @@ class InstallCommandTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('testedvalue', $this->config['b8']['database']['name']);
     }
 
-    public function testDatabaseUserameConfig()
+    public function testDatabaseUserConfig()
     {
         $dialog = $this->getDialogHelperMock();
 
@@ -243,7 +243,7 @@ class InstallCommandTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('test@phpci.com', $this->admin['mail']);
     }
 
-    public function testAdminUserameConfig()
+    public function testAdminNameConfig()
     {
         $dialog = $this->getDialogHelperMock();
 
diff --git a/Tests/PHPCI/Plugin/EmailTest.php b/Tests/PHPCI/Plugin/EmailTest.php
index bb039ca4..0787d41d 100644
--- a/Tests/PHPCI/Plugin/EmailTest.php
+++ b/Tests/PHPCI/Plugin/EmailTest.php
@@ -236,11 +236,11 @@ class EmailTest extends \PHPUnit_Framework_TestCase
     /**
      * @covers PHPUnit::execute
      */
-    public function testExecute_UniqueRecipientsWithCommiter()
+    public function testExecute_UniqueRecipientsWithCommitter()
     {
         $this->loadEmailPluginWithOptions(
             array(
-                'commiter'  => true,
+                'committer'  => true,
                 'addresses' => array('test-receiver@example.com', 'committer@test.com')
             )
         );
diff --git a/Tests/PHPCI/Plugin/Util/FilesPluginInformationTest.php b/Tests/PHPCI/Plugin/Util/FilesPluginInformationTest.php
index 1b674e9c..4af2d7a6 100644
--- a/Tests/PHPCI/Plugin/Util/FilesPluginInformationTest.php
+++ b/Tests/PHPCI/Plugin/Util/FilesPluginInformationTest.php
@@ -15,7 +15,7 @@ use PHPCI\Plugin\Util\FilesPluginInformation;
 class FilesPluginInformationTest extends \PHPUnit_Framework_TestCase
 {
 
-    public function testGetInstalledPlugins_returnsObjectes()
+    public function testGetInstalledPlugins_returnsObjects()
     {
         $pluginDirPath = realpath(__DIR__ . "/../../../../PHPCI/Plugin/");
         $test = FilesPluginInformation::newFromDir($pluginDirPath);
diff --git a/bootstrap.php b/bootstrap.php
index 18d91d07..ca30f940 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -62,7 +62,7 @@ if (file_exists($configFile)) {
 
 /**
  * Allow to modify PHPCI configuration without modify versioned code.
- * Dameons should be killed to apply changes in the file.
+ * Daemons should be killed to apply changes in the file.
  *
  * @ticket 781
  */

From 8a3d7605d5846e92732e2fe3948db14985d447e2 Mon Sep 17 00:00:00 2001
From: DELORME Jonathan 
Date: Tue, 30 Jun 2015 11:43:25 +0200
Subject: [PATCH 224/329] Fixed a css issue with Block8 logo

In Chrome (Android L), when you focus an input, the Block8 logo overrides the view.
See : http://s10.postimg.org/d5ffp7dwp/2015_06_30_07_57_03.png
---
 PHPCI/View/Session.phtml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/PHPCI/View/Session.phtml b/PHPCI/View/Session.phtml
index 9975d697..c28d9bfc 100644
--- a/PHPCI/View/Session.phtml
+++ b/PHPCI/View/Session.phtml
@@ -67,6 +67,14 @@
             bottom: 50px;
             right: 50px;
         }
+        
+        @media(max-width:767px) { 
+            #logo {
+                position: inherit;
+                margin: 0 auto;
+                margin-top: 50px;
+            }
+        }
 
         #logo:hover {
             background-image: url('https://www.block8.co.uk/assets/images/b8-phpci-logo.png');

From 92ee90998a1b6b218656195a78366542d74a97a3 Mon Sep 17 00:00:00 2001
From: Steve Robbins 
Date: Wed, 27 May 2015 14:20:37 -0700
Subject: [PATCH 225/329] Fixes notice in github builds

Closed #996
---
 PHPCI/Model/Build/GithubBuild.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PHPCI/Model/Build/GithubBuild.php b/PHPCI/Model/Build/GithubBuild.php
index d6b2b7b9..a7504c6f 100644
--- a/PHPCI/Model/Build/GithubBuild.php
+++ b/PHPCI/Model/Build/GithubBuild.php
@@ -221,6 +221,6 @@ class GithubBuild extends RemoteGitBuild
         $helper = new Diff();
         $lines = $helper->getLinePositions($diff);
 
-        return $lines[$line];
+        return isset($lines[$line]) ? $lines[$line] : null;
     }
 }

From f55b336900af5dda7ab50a73416f099624ff5cc6 Mon Sep 17 00:00:00 2001
From: Mehmet Ali Ergut 
Date: Tue, 12 May 2015 00:29:45 +0300
Subject: [PATCH 226/329] Fixes default value for PHP Cs Fixer ( #833 )

---
 PHPCI/Plugin/PhpCsFixer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/PHPCI/Plugin/PhpCsFixer.php b/PHPCI/Plugin/PhpCsFixer.php
index e07db718..7a173e64 100644
--- a/PHPCI/Plugin/PhpCsFixer.php
+++ b/PHPCI/Plugin/PhpCsFixer.php
@@ -32,10 +32,10 @@ class PhpCsFixer implements \PHPCI\Plugin
     protected $build;
 
     protected $workingDir = '';
-    protected $level      = ' --level=all';
+    protected $level      = ' --level=psr2';
     protected $verbose    = '';
     protected $diff       = '';
-    protected $levels     = array('psr0', 'psr1', 'psr2', 'all');
+    protected $levels     = array('psr0', 'psr1', 'psr2', 'symfony');
 
     /**
      * Standard Constructor

From dc6e63a7e79e479849674399a98736c4948d9bf4 Mon Sep 17 00:00:00 2001
From: Dariusz Ruminski 
Date: Tue, 8 Sep 2015 01:03:43 +0200
Subject: [PATCH 227/329] PHP CS Fixer - fix name Closed #1054

---
 PHPCI/Plugin/PhpCsFixer.php | 2 +-
 composer.json               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/PHPCI/Plugin/PhpCsFixer.php b/PHPCI/Plugin/PhpCsFixer.php
index e07db718..9ab187cc 100644
--- a/PHPCI/Plugin/PhpCsFixer.php
+++ b/PHPCI/Plugin/PhpCsFixer.php
@@ -14,7 +14,7 @@ use PHPCI\Helper\Lang;
 use PHPCI\Model\Build;
 
 /**
-* PHP CS Fixer - Works with the PHP CS Fixer for testing coding standards.
+* PHP CS Fixer - Works with the PHP Coding Standards Fixer for testing coding standards.
 * @author       Gabriel Baker 
 * @package      PHPCI
 * @subpackage   Plugins
diff --git a/composer.json b/composer.json
index 3de523e5..df573f9a 100644
--- a/composer.json
+++ b/composer.json
@@ -69,7 +69,7 @@
         "sebastian/phpcpd": "PHP Copy/Paste Detector",
         "squizlabs/php_codesniffer": "PHP Code Sniffer",
         "phpspec/phpspec": "PHP Spec",
-        "fabpot/php-cs-fixer": "PHP Code Sniffer Fixer",
+        "fabpot/php-cs-fixer": "PHP Coding Standards Fixer",
         "phploc/phploc": "PHP Lines of Code",
         "atoum/atoum": "Atoum",
         "jakub-onderka/php-parallel-lint": "Parallel Linting Tool",

From aaf93ddd7d6f3baa0405732a52160484bd088d94 Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Fri, 2 Oct 2015 21:35:53 +0100
Subject: [PATCH 228/329] Updating PHPCI to send more detailed commit statuses,
 for @REBELinBLUE.

---
 PHPCI/Model/Build/GithubBuild.php | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/PHPCI/Model/Build/GithubBuild.php b/PHPCI/Model/Build/GithubBuild.php
index a7504c6f..b5d8ccbb 100644
--- a/PHPCI/Model/Build/GithubBuild.php
+++ b/PHPCI/Model/Build/GithubBuild.php
@@ -59,25 +59,35 @@ class GithubBuild extends RemoteGitBuild
             case 0:
             case 1:
                 $status = 'pending';
+                $description = 'PHPCI build running.';
                 break;
             case 2:
                 $status = 'success';
+                $description = 'PHPCI build passed.';
                 break;
             case 3:
                 $status = 'failure';
+                $description = 'PHPCI build failed.';
                 break;
             default:
                 $status = 'error';
+                $description = 'PHPCI build failed to complete.';
                 break;
         }
 
         $phpciUrl = \b8\Config::getInstance()->get('phpci.url');
-        $params = array(    'state' => $status,
-                            'target_url' => $phpciUrl . '/build/view/' . $this->getId());
+
+        $params = array(
+            'state' => $status,
+            'target_url' => $phpciUrl . '/build/view/' . $this->getId(),
+            'description' => $description,
+            'context' => 'PHPCI',
+        );
+
         $headers = array(
             'Authorization: token ' . $token,
             'Content-Type: application/x-www-form-urlencoded'
-            );
+        );
 
         $http->setHeaders($headers);
         $http->request('POST', $url, json_encode($params));

From b171a10759caddd279e6bb5240b263b94a9cdd8d Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Fri, 2 Oct 2015 21:53:39 +0100
Subject: [PATCH 229/329] Fixing Codeception plugin PHPCS errors.

---
 PHPCI/Plugin/Codeception.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/PHPCI/Plugin/Codeception.php b/PHPCI/Plugin/Codeception.php
index b906fb70..6d020210 100644
--- a/PHPCI/Plugin/Codeception.php
+++ b/PHPCI/Plugin/Codeception.php
@@ -130,6 +130,7 @@ class Codeception implements \PHPCI\Plugin, \PHPCI\ZeroConfigPlugin
         }
 
         $cmd = 'cd "%s" && ' . $codecept . ' run -c "%s" --xml ' . $this->args;
+
         if (IS_WIN) {
             $cmd = 'cd /d "%s" && ' . $codecept . ' run -c "%s" --xml ' . $this->args;
         }
@@ -137,14 +138,12 @@ class Codeception implements \PHPCI\Plugin, \PHPCI\ZeroConfigPlugin
         $configPath = $this->phpci->buildPath . $configPath;
         $success = $this->phpci->executeCommand($cmd, $this->phpci->buildPath, $configPath);
 
+        $this->phpci->log(
+            'Codeception XML path: '. $this->phpci->buildPath . $this->path . 'report.xml',
+            Loglevel::DEBUG
+        );
 
-            $this->phpci->log(
-                'Codeception XML path: '. $this->phpci->buildPath . $this->path . 'report.xml',
-                Loglevel::DEBUG
-            );
-            $xml = file_get_contents($this->phpci->buildPath . $this->path . 'report.xml', false);
-
-
+        $xml = file_get_contents($this->phpci->buildPath . $this->path . 'report.xml', false);
         $parser = new Parser($this->phpci, $xml);
         $output = $parser->parse();
 
@@ -157,7 +156,6 @@ class Codeception implements \PHPCI\Plugin, \PHPCI\ZeroConfigPlugin
         $this->build->storeMeta('codeception-meta', $meta);
         $this->build->storeMeta('codeception-data', $output);
         $this->build->storeMeta('codeception-errors', $parser->getTotalFailures());
-
         $this->phpci->logExecOutput(true);
 
         return $success;

From 9ee27bad3713565e83e010e496067d58fca3a9ee Mon Sep 17 00:00:00 2001
From: Stephen Ball 
Date: Sun, 4 Oct 2015 17:38:03 +0100
Subject: [PATCH 230/329] Adding support to check for .phpci.yml so the file
 can be 'hidden' as with other CI systems such as Travis, StyleCI and
 Codeclimate

---
 PHPCI/Model/Build.php          | 5 +++++
 PHPCI/Plugin/TechnicalDebt.php | 1 +
 2 files changed, 6 insertions(+)

diff --git a/PHPCI/Model/Build.php b/PHPCI/Model/Build.php
index a0019438..3e3ab3e2 100644
--- a/PHPCI/Model/Build.php
+++ b/PHPCI/Model/Build.php
@@ -104,6 +104,11 @@ class Build extends BuildBase
             $build_config = file_get_contents($buildPath . '/phpci.yml');
         }
 
+        // Try .phpci.yml
+        if (empty($build_config) && is_file($buildPath . '/.phpci.yml')) {
+            $build_config = file_get_contents($buildPath . '/.phpci.yml');
+        }
+
         // Try getting the project build config from the database:
         if (empty($build_config)) {
             $build_config = $this->getProject()->getBuildConfig();
diff --git a/PHPCI/Plugin/TechnicalDebt.php b/PHPCI/Plugin/TechnicalDebt.php
index 163c94c6..91f75d93 100755
--- a/PHPCI/Plugin/TechnicalDebt.php
+++ b/PHPCI/Plugin/TechnicalDebt.php
@@ -151,6 +151,7 @@ class TechnicalDebt implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
 
         $ignores = $this->ignore;
         $ignores[] = 'phpci.yml';
+        $ignores[] = '.phpci.yml';
 
         foreach ($iterator as $file) {
             $filePath = $file->getRealPath();

From fa979f6a0234420a2330ddb7a23ac3a6c2cb2ad9 Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Mon, 5 Oct 2015 09:56:36 +0100
Subject: [PATCH 231/329] Fixing composer.json

---
 composer.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index df573f9a..3b0ec9f0 100644
--- a/composer.json
+++ b/composer.json
@@ -47,8 +47,7 @@
         "monolog/monolog": "~1.6",
         "pimple/pimple": "~1.1",
         "robmorgan/phinx": "~0.4",
-        "sensiolabs/ansi-to-html": "~1.1",
-        "jakub-onderka/php-parallel-lint": "0.8.*"
+        "sensiolabs/ansi-to-html": "~1.1"
     },
 
     "autoload-dev": {
@@ -60,7 +59,8 @@
         "phpmd/phpmd": "~2.0",
         "squizlabs/php_codesniffer": "~2.3",
         "block8/php-docblock-checker": "~1.0",
-        "phploc/phploc": "~2.0"
+        "phploc/phploc": "~2.0",
+        "jakub-onderka/php-parallel-lint": "0.8.*"
     },
 
     "suggest": {

From 6c3341783981b55d75773b32bf4ba5cca4c5e056 Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Mon, 5 Oct 2015 09:57:50 +0100
Subject: [PATCH 232/329] More composer.json cleanup

---
 composer.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/composer.json b/composer.json
index 3b0ec9f0..e20a3b1b 100644
--- a/composer.json
+++ b/composer.json
@@ -50,10 +50,6 @@
         "sensiolabs/ansi-to-html": "~1.1"
     },
 
-    "autoload-dev": {
-        "psr-4": { "Tests\\PHPCI\\": "Tests/PHPCI" }
-    },
-
     "require-dev": {
         "phpunit/phpunit": "~4.5",
         "phpmd/phpmd": "~2.0",

From 647c0eb09cf62c3a7dfb9e300ba1d3efa466ef55 Mon Sep 17 00:00:00 2001
From: Stephen Ball 
Date: Mon, 5 Oct 2015 10:17:04 +0100
Subject: [PATCH 233/329] Update Build.php

Changed the order the files are loaded in
---
 PHPCI/Model/Build.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/PHPCI/Model/Build.php b/PHPCI/Model/Build.php
index 3e3ab3e2..3243f9fa 100644
--- a/PHPCI/Model/Build.php
+++ b/PHPCI/Model/Build.php
@@ -99,14 +99,14 @@ class Build extends BuildBase
     {
         $build_config = null;
 
-        // Try phpci.yml first:
-        if (is_file($buildPath . '/phpci.yml')) {
-            $build_config = file_get_contents($buildPath . '/phpci.yml');
+        // Try .phpci.yml
+        if (is_file($buildPath . '/.phpci.yml')) {
+            $build_config = file_get_contents($buildPath . '/.phpci.yml');
         }
 
-        // Try .phpci.yml
-        if (empty($build_config) && is_file($buildPath . '/.phpci.yml')) {
-            $build_config = file_get_contents($buildPath . '/.phpci.yml');
+        // Try phpci.yml first:
+        if (empty($build_config) && is_file($buildPath . '/phpci.yml')) {
+            $build_config = file_get_contents($buildPath . '/phpci.yml');
         }
 
         // Try getting the project build config from the database:

From 06204ef17138e8188203b15a17bfd9f738aae025 Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Mon, 5 Oct 2015 12:13:22 +0100
Subject: [PATCH 234/329] Adding support for beanstalkd-based workers.

---
 PHPCI/Command/WorkerCommand.php        |  80 +++
 PHPCI/Controller/WebhookController.php |   4 -
 PHPCI/Model/Build.php                  |   2 +-
 PHPCI/Service/BuildService.php         |  39 +-
 PHPCI/Worker/BuildWorker.php           | 160 ++++++
 bootstrap.php                          |   3 +
 composer.json                          |   3 +-
 composer.lock                          | 761 ++++++++++++++-----------
 console                                |   2 +
 9 files changed, 701 insertions(+), 353 deletions(-)
 create mode 100644 PHPCI/Command/WorkerCommand.php
 create mode 100644 PHPCI/Worker/BuildWorker.php

diff --git a/PHPCI/Command/WorkerCommand.php b/PHPCI/Command/WorkerCommand.php
new file mode 100644
index 00000000..49685656
--- /dev/null
+++ b/PHPCI/Command/WorkerCommand.php
@@ -0,0 +1,80 @@
+
+* @package      PHPCI
+* @subpackage   Console
+*/
+class WorkerCommand extends Command
+{
+    /**
+     * @var OutputInterface
+     */
+    protected $output;
+
+    /**
+     * @var Logger
+     */
+    protected $logger;
+
+    /**
+     * @param \Monolog\Logger $logger
+     * @param string $name
+     */
+    public function __construct(Logger $logger, $name = null)
+    {
+        parent::__construct($name);
+        $this->logger = $logger;
+    }
+
+    protected function configure()
+    {
+        $this
+            ->setName('phpci:worker')
+            ->setDescription('Runs the PHPCI build worker.');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $this->output = $output;
+
+        // For verbose mode we want to output all informational and above
+        // messages to the symphony output interface.
+        if ($input->hasOption('verbose') && $input->getOption('verbose')) {
+            $this->logger->pushHandler(
+                new OutputLogHandler($this->output, Logger::INFO)
+            );
+        }
+
+        $config = Config::getInstance()->get('phpci.worker', []);
+
+        if (empty($config['host']) || empty($config['queue'])) {
+            $error = 'The worker is not configured. You must set a host and queue in your config.yml file.';
+            throw new \Exception($error);
+        }
+
+        $worker = new BuildWorker($config['host'], $config['queue']);
+        $worker->setLogger($this->logger);
+        $worker->setMaxJobs(Config::getInstance()->get('phpci.worker.max_jobs', -1));
+        $worker->startWorker();
+    }
+}
diff --git a/PHPCI/Controller/WebhookController.php b/PHPCI/Controller/WebhookController.php
index 45a775ad..f9a764ca 100644
--- a/PHPCI/Controller/WebhookController.php
+++ b/PHPCI/Controller/WebhookController.php
@@ -364,10 +364,6 @@ class WebhookController extends \b8\Controller
 
         // If not, create a new build job for it:
         $build = $this->buildService->createBuild($project, $commitId, $branch, $committer, $commitMessage, $extra);
-        $build = BuildFactory::getBuild($build);
-
-        // Send a status postback if the build type provides one:
-        $build->sendStatusPostback();
 
         return array('status' => 'ok', 'buildID' => $build->getID());
     }
diff --git a/PHPCI/Model/Build.php b/PHPCI/Model/Build.php
index a0019438..192acea6 100644
--- a/PHPCI/Model/Build.php
+++ b/PHPCI/Model/Build.php
@@ -228,7 +228,7 @@ class Build extends BuildBase
         if (!$this->getId()) {
             return null;
         }
-        return PHPCI_BUILD_ROOT_DIR . $this->getId();
+        return PHPCI_BUILD_ROOT_DIR . $this->getId() . '_' . substr(md5(microtime(true)), 0, 5);
     }
 
     /**
diff --git a/PHPCI/Service/BuildService.php b/PHPCI/Service/BuildService.php
index ca2fae4d..ed1ed6c3 100644
--- a/PHPCI/Service/BuildService.php
+++ b/PHPCI/Service/BuildService.php
@@ -9,6 +9,10 @@
 
 namespace PHPCI\Service;
 
+use b8\Config;
+use Pheanstalk\Pheanstalk;
+use Pheanstalk\PheanstalkInterface;
+use PHPCI\BuildFactory;
 use PHPCI\Helper\Lang;
 use PHPCI\Model\Build;
 use PHPCI\Model\Project;
@@ -81,7 +85,13 @@ class BuildService
             $build->setExtra(json_encode($extra));
         }
 
-        return $this->buildStore->save($build);
+        $build = $this->buildStore->save($build);
+
+        $build = BuildFactory::getBuild($build);
+        $build->sendStatusPostback();
+        $this->addBuildToQueue($build);
+
+        return $build;
     }
 
     /**
@@ -117,4 +127,31 @@ class BuildService
         $build->removeBuildDirectory();
         return $this->buildStore->delete($build);
     }
+
+
+    public function addBuildToQueue(Build $build)
+    {
+        $config = Config::getInstance();
+
+        $settings = $config->get('phpci.worker', []);
+
+        if (!empty($settings['host']) && !empty($settings['queue'])) {
+            $jobData = array(
+                'build_id' => $build->getId(),
+            );
+
+            if ($config->get('using_custom_file')) {
+                $jobData['config'] = $config->getArray();
+            }
+
+            $pheanstalk = new Pheanstalk($settings['host']);
+            $pheanstalk->useTube($settings['queue']);
+            $pheanstalk->put(
+                json_encode($jobData),
+                PheanstalkInterface::DEFAULT_PRIORITY,
+                PheanstalkInterface::DEFAULT_DELAY,
+                $config->get('phpci.worker.job_timeout', 600)
+            );
+        }
+    }
 }
diff --git a/PHPCI/Worker/BuildWorker.php b/PHPCI/Worker/BuildWorker.php
new file mode 100644
index 00000000..9d13ffdd
--- /dev/null
+++ b/PHPCI/Worker/BuildWorker.php
@@ -0,0 +1,160 @@
+host = $host;
+        $this->queue = $queue;
+    }
+
+    /**
+     * @param int $maxJobs
+     */
+    public function setMaxJobs($maxJobs = -1)
+    {
+        $this->maxJobs = $maxJobs;
+    }
+
+    /**
+     * @param Logger $logger
+     */
+    public function setLogger(Logger $logger)
+    {
+        $this->logger = $logger;
+    }
+
+    /**
+     * Start the worker.
+     */
+    public function startWorker()
+    {
+        $pheanstalk = new Pheanstalk($this->host);
+        $pheanstalk->watch($this->queue);
+        $buildStore = Factory::getStore('Build');
+
+        $jobs = 0;
+
+        while ($this->run) {
+            // Get a job from the queue:
+            $job = $pheanstalk->reserve();
+
+            // Make sure we don't run more than maxJobs jobs on this worker:
+            $jobs++;
+
+            if ($this->maxJobs != -1 && $this->maxJobs <= $jobs) {
+                $this->run = false;
+            }
+
+            // Get the job data and run the job:
+            $jobData = json_decode($job->getData(), true);
+            $this->logger->addInfo('Received build #'.$jobData['build_id'].' from Beanstalkd');
+
+            // If the job comes with config data, reset our config and database connections
+            // and then make sure we kill the worker afterwards:
+            if (!empty($jobData['config'])) {
+                $this->logger->addDebug('Using job-specific config.');
+                $currentConfig = Config::getInstance()->getArray();
+                $config = new Config($jobData['config']);
+                Database::reset($config);
+            }
+
+            $build = BuildFactory::getBuildById($jobData['build_id']);
+
+            if (empty($build)) {
+                $this->logger->addWarning('Build #' . $jobData['build_id'] . ' does not exist in the database.');
+                $pheanstalk->delete($job);
+            }
+
+            try {
+                // Logging relevant to this build should be stored
+                // against the build itself.
+                $buildDbLog = new BuildDBLogHandler($build, Logger::INFO);
+                $this->logger->pushHandler($buildDbLog);
+
+                $builder = new Builder($build, $this->logger);
+                $builder->execute();
+
+                // After execution we no longer want to record the information
+                // back to this specific build so the handler should be removed.
+                $this->logger->popHandler($buildDbLog);
+            } catch (\PDOException $ex) {
+                // If we've caught a PDO Exception, it is probably not the fault of the build, but of a failed
+                // connection or similar. Release the job and kill the worker.
+                $this->run = false;
+                $pheanstalk->release($job);
+            } catch (\Exception $ex) {
+                $build->setStatus(Build::STATUS_FAILED);
+                $build->setFinished(new \DateTime());
+                $build->setLog($build->getLog() . PHP_EOL . PHP_EOL . $ex->getMessage());
+                $buildStore->save($build);
+                $build->sendStatusPostback();
+            }
+
+            // Reset the config back to how it was prior to running this job:
+            if (!empty($currentConfig)) {
+                $config = new Config($currentConfig);
+                Database::reset($config);
+            }
+
+            // Delete the job when we're done:
+            $pheanstalk->delete($job);
+        }
+    }
+
+    /**
+     * Stops the worker after the current build.
+     */
+    public function stopWorker()
+    {
+        $this->run = false;
+    }
+}
diff --git a/bootstrap.php b/bootstrap.php
index 18d91d07..ef1fe197 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -17,9 +17,11 @@ if (empty($timezone)) {
 
 $configFile = dirname(__FILE__) . '/PHPCI/config.yml';
 $configEnv = getenv('phpci_config_file');
+$usingCustomConfigFile = false;
 
 if (!empty($configEnv) && file_exists($configEnv)) {
     $configFile = $configEnv;
+    $usingCustomConfigFile = true;
 }
 
 // If we don't have a config file at all, fail at this point and tell the user to install:
@@ -53,6 +55,7 @@ $conf = array();
 $conf['b8']['app']['namespace'] = 'PHPCI';
 $conf['b8']['app']['default_controller'] = 'Home';
 $conf['b8']['view']['path'] = dirname(__FILE__) . '/PHPCI/View/';
+$conf['using_custom_file'] = $usingCustomConfigFile;
 
 $config = new b8\Config($conf);
 
diff --git a/composer.json b/composer.json
index e20a3b1b..fad44cd9 100644
--- a/composer.json
+++ b/composer.json
@@ -47,7 +47,8 @@
         "monolog/monolog": "~1.6",
         "pimple/pimple": "~1.1",
         "robmorgan/phinx": "~0.4",
-        "sensiolabs/ansi-to-html": "~1.1"
+        "sensiolabs/ansi-to-html": "~1.1",
+        "pda/pheanstalk": "~3.1"
     },
 
     "require-dev": {
diff --git a/composer.lock b/composer.lock
index 21e42d42..34626b27 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,23 +1,24 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "0be92d5565a805ffe462c6061ed1dcf4",
+    "hash": "22ff64c3aa3c951901e6332784ab617e",
+    "content-hash": "177ce296bc661eb8bff467cbd10a88e4",
     "packages": [
         {
             "name": "block8/b8framework",
-            "version": "1.1.9",
+            "version": "1.1.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Block8/b8framework.git",
-                "reference": "3952dabee84cbf5be3dd8d20eadd13b6219e7a6a"
+                "reference": "5d2d2863ce15a6b91e0b2aed4250dd29c6224446"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Block8/b8framework/zipball/3952dabee84cbf5be3dd8d20eadd13b6219e7a6a",
-                "reference": "3952dabee84cbf5be3dd8d20eadd13b6219e7a6a",
+                "url": "https://api.github.com/repos/Block8/b8framework/zipball/5d2d2863ce15a6b91e0b2aed4250dd29c6224446",
+                "reference": "5d2d2863ce15a6b91e0b2aed4250dd29c6224446",
                 "shasum": ""
             },
             "require": {
@@ -51,7 +52,7 @@
                 "mvc",
                 "php"
             ],
-            "time": "2014-12-01 21:02:58"
+            "time": "2015-10-05 10:50:20"
         },
         {
             "name": "ircmaxell/password-compat",
@@ -95,65 +96,18 @@
             ],
             "time": "2014-11-20 16:49:30"
         },
-        {
-            "name": "jakub-onderka/php-parallel-lint",
-            "version": "v0.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/JakubOnderka/PHP-Parallel-Lint.git",
-                "reference": "2b242dcdbdd7369d2a746518ac31bb30c514b728"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/JakubOnderka/PHP-Parallel-Lint/zipball/2b242dcdbdd7369d2a746518ac31bb30c514b728",
-                "reference": "2b242dcdbdd7369d2a746518ac31bb30c514b728",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "jakub-onderka/php-console-highlighter": "~0.3",
-                "nette/tester": "~1.3"
-            },
-            "suggest": {
-                "jakub-onderka/php-console-highlighter": "Highlight syntax in code snippet"
-            },
-            "bin": [
-                "parallel-lint"
-            ],
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "./"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD"
-            ],
-            "authors": [
-                {
-                    "name": "Jakub Onderka",
-                    "email": "jakub.onderka@gmail.com"
-                }
-            ],
-            "description": "This tool check syntax of PHP files about 20x faster than serial check.",
-            "homepage": "https://github.com/JakubOnderka/PHP-Parallel-Lint",
-            "time": "2014-10-05 10:19:39"
-        },
         {
             "name": "monolog/monolog",
-            "version": "1.12.0",
+            "version": "1.17.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "1fbe8c2641f2b163addf49cc5e18f144bec6b19f"
+                "reference": "0524c87587ab85bc4c2d6f5b41253ccb930a5422"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1fbe8c2641f2b163addf49cc5e18f144bec6b19f",
-                "reference": "1fbe8c2641f2b163addf49cc5e18f144bec6b19f",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/0524c87587ab85bc4c2d6f5b41253ccb930a5422",
+                "reference": "0524c87587ab85bc4c2d6f5b41253ccb930a5422",
                 "shasum": ""
             },
             "require": {
@@ -164,12 +118,15 @@
                 "psr/log-implementation": "1.0.0"
             },
             "require-dev": {
-                "aws/aws-sdk-php": "~2.4, >2.4.8",
+                "aws/aws-sdk-php": "^2.4.9",
                 "doctrine/couchdb": "~1.0@dev",
                 "graylog2/gelf-php": "~1.0",
-                "phpunit/phpunit": "~4.0",
-                "raven/raven": "~0.5",
-                "ruflin/elastica": "0.90.*",
+                "php-console/php-console": "^3.1.3",
+                "phpunit/phpunit": "~4.5",
+                "phpunit/phpunit-mock-objects": "2.3.0",
+                "raven/raven": "~0.11",
+                "ruflin/elastica": ">=0.90 <3.0",
+                "swiftmailer/swiftmailer": "~5.3",
                 "videlalvaro/php-amqplib": "~2.4"
             },
             "suggest": {
@@ -178,6 +135,7 @@
                 "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
                 "ext-mongo": "Allow sending log messages to a MongoDB server",
                 "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
+                "php-console/php-console": "Allow sending log messages to Google Chrome",
                 "raven/raven": "Allow sending log messages to a Sentry server",
                 "rollbar/rollbar": "Allow sending log messages to Rollbar",
                 "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
@@ -186,7 +144,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.12.x-dev"
+                    "dev-master": "1.16.x-dev"
                 }
             },
             "autoload": {
@@ -212,19 +170,69 @@
                 "logging",
                 "psr-3"
             ],
-            "time": "2014-12-29 21:29:35"
+            "time": "2015-08-31 09:17:37"
+        },
+        {
+            "name": "pda/pheanstalk",
+            "version": "v3.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pda/pheanstalk.git",
+                "reference": "430e77c551479aad0c6ada0450ee844cf656a18b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pda/pheanstalk/zipball/430e77c551479aad0c6ada0450ee844cf656a18b",
+                "reference": "430e77c551479aad0c6ada0450ee844cf656a18b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Pheanstalk\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Paul Annesley",
+                    "email": "paul@annesley.cc",
+                    "homepage": "http://paul.annesley.cc/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "PHP client for beanstalkd queue",
+            "homepage": "https://github.com/pda/pheanstalk",
+            "keywords": [
+                "beanstalkd"
+            ],
+            "time": "2015-08-07 21:42:41"
         },
         {
             "name": "pimple/pimple",
             "version": "v1.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/fabpot/Pimple.git",
+                "url": "https://github.com/silexphp/Pimple.git",
                 "reference": "2019c145fe393923f3441b23f29bbdfaa5c58c4d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fabpot/Pimple/zipball/2019c145fe393923f3441b23f29bbdfaa5c58c4d",
+                "url": "https://api.github.com/repos/silexphp/Pimple/zipball/2019c145fe393923f3441b23f29bbdfaa5c58c4d",
                 "reference": "2019c145fe393923f3441b23f29bbdfaa5c58c4d",
                 "shasum": ""
             },
@@ -302,23 +310,23 @@
         },
         {
             "name": "robmorgan/phinx",
-            "version": "v0.4.3",
+            "version": "v0.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/robmorgan/phinx.git",
-                "reference": "0d1f9cb9939f65f506a8a3f5fee356764c310fd4"
+                "reference": "1351ca36dd2419d7de02afd1aaa415929112d7f1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/robmorgan/phinx/zipball/0d1f9cb9939f65f506a8a3f5fee356764c310fd4",
-                "reference": "0d1f9cb9939f65f506a8a3f5fee356764c310fd4",
+                "url": "https://api.github.com/repos/robmorgan/phinx/zipball/1351ca36dd2419d7de02afd1aaa415929112d7f1",
+                "reference": "1351ca36dd2419d7de02afd1aaa415929112d7f1",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.2",
-                "symfony/config": "~2.6.0",
-                "symfony/console": "~2.6.0",
-                "symfony/yaml": "~2.6.0"
+                "symfony/config": "~2.7",
+                "symfony/console": "~2.7",
+                "symfony/yaml": "~2.7"
             },
             "require-dev": {
                 "phpunit/phpunit": "3.7.*",
@@ -360,20 +368,20 @@
                 "migrations",
                 "phinx"
             ],
-            "time": "2015-02-23 16:38:12"
+            "time": "2015-09-11 15:44:41"
         },
         {
             "name": "sensiolabs/ansi-to-html",
-            "version": "v1.1.1",
+            "version": "v1.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sensiolabs/ansi-to-html.git",
-                "reference": "fd0aa98170e12131ab989c39252df076cff60121"
+                "reference": "02598b975c510e9e7d07d0be0a89c7a6b43464d6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sensiolabs/ansi-to-html/zipball/fd0aa98170e12131ab989c39252df076cff60121",
-                "reference": "fd0aa98170e12131ab989c39252df076cff60121",
+                "url": "https://api.github.com/repos/sensiolabs/ansi-to-html/zipball/02598b975c510e9e7d07d0be0a89c7a6b43464d6",
+                "reference": "02598b975c510e9e7d07d0be0a89c7a6b43464d6",
                 "shasum": ""
             },
             "require": {
@@ -404,32 +412,32 @@
                 }
             ],
             "description": "A library to convert a text with ANSI codes to HTML",
-            "time": "2015-03-17 06:34:10"
+            "time": "2015-07-22 03:07:58"
         },
         {
             "name": "swiftmailer/swiftmailer",
-            "version": "v5.3.1",
+            "version": "v5.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/swiftmailer/swiftmailer.git",
-                "reference": "c5f963e7f9d6f6438fda4f22d5cc2db296ec621a"
+                "reference": "0697e6aa65c83edf97bb0f23d8763f94e3f11421"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/c5f963e7f9d6f6438fda4f22d5cc2db296ec621a",
-                "reference": "c5f963e7f9d6f6438fda4f22d5cc2db296ec621a",
+                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/0697e6aa65c83edf97bb0f23d8763f94e3f11421",
+                "reference": "0697e6aa65c83edf97bb0f23d8763f94e3f11421",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
             "require-dev": {
-                "mockery/mockery": "~0.9.1"
+                "mockery/mockery": "~0.9.1,<0.9.4"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.3-dev"
+                    "dev-master": "5.4-dev"
                 }
             },
             "autoload": {
@@ -453,38 +461,41 @@
             "description": "Swiftmailer, free feature-rich PHP mailer",
             "homepage": "http://swiftmailer.org",
             "keywords": [
+                "email",
                 "mail",
                 "mailer"
             ],
-            "time": "2014-12-05 14:17:14"
+            "time": "2015-06-06 14:19:39"
         },
         {
             "name": "symfony/config",
-            "version": "v2.6.4",
-            "target-dir": "Symfony/Component/Config",
+            "version": "v2.7.5",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/Config.git",
-                "reference": "a9f781ba1221067d1f07c8cec0bc50f81b8d7408"
+                "url": "https://github.com/symfony/config.git",
+                "reference": "9698fdf0a750d6887d5e7729d5cf099765b20e61"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Config/zipball/a9f781ba1221067d1f07c8cec0bc50f81b8d7408",
-                "reference": "a9f781ba1221067d1f07c8cec0bc50f81b8d7408",
+                "url": "https://api.github.com/repos/symfony/config/zipball/9698fdf0a750d6887d5e7729d5cf099765b20e61",
+                "reference": "9698fdf0a750d6887d5e7729d5cf099765b20e61",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3",
+                "php": ">=5.3.9",
                 "symfony/filesystem": "~2.3"
             },
+            "require-dev": {
+                "symfony/phpunit-bridge": "~2.7"
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.6-dev"
+                    "dev-master": "2.7-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
+                "psr-4": {
                     "Symfony\\Component\\Config\\": ""
                 }
             },
@@ -493,40 +504,40 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony Config Component",
-            "homepage": "http://symfony.com",
-            "time": "2015-01-21 20:57:55"
+            "homepage": "https://symfony.com",
+            "time": "2015-09-21 15:02:29"
         },
         {
             "name": "symfony/console",
-            "version": "v2.6.4",
-            "target-dir": "Symfony/Component/Console",
+            "version": "v2.7.5",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/Console.git",
-                "reference": "e44154bfe3e41e8267d7a3794cd9da9a51cfac34"
+                "url": "https://github.com/symfony/console.git",
+                "reference": "06cb17c013a82f94a3d840682b49425cd00a2161"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Console/zipball/e44154bfe3e41e8267d7a3794cd9da9a51cfac34",
-                "reference": "e44154bfe3e41e8267d7a3794cd9da9a51cfac34",
+                "url": "https://api.github.com/repos/symfony/console/zipball/06cb17c013a82f94a3d840682b49425cd00a2161",
+                "reference": "06cb17c013a82f94a3d840682b49425cd00a2161",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=5.3.9"
             },
             "require-dev": {
                 "psr/log": "~1.0",
                 "symfony/event-dispatcher": "~2.1",
+                "symfony/phpunit-bridge": "~2.7",
                 "symfony/process": "~2.1"
             },
             "suggest": {
@@ -537,11 +548,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.6-dev"
+                    "dev-master": "2.7-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
+                "psr-4": {
                     "Symfony\\Component\\Console\\": ""
                 }
             },
@@ -550,45 +561,47 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony Console Component",
-            "homepage": "http://symfony.com",
-            "time": "2015-01-25 04:39:26"
+            "homepage": "https://symfony.com",
+            "time": "2015-09-25 08:32:23"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v2.6.4",
-            "target-dir": "Symfony/Component/Filesystem",
+            "version": "v2.7.5",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/Filesystem.git",
-                "reference": "a1f566d1f92e142fa1593f4555d6d89e3044a9b7"
+                "url": "https://github.com/symfony/filesystem.git",
+                "reference": "a17f8a17c20e8614c15b8e116e2f4bcde102cfab"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Filesystem/zipball/a1f566d1f92e142fa1593f4555d6d89e3044a9b7",
-                "reference": "a1f566d1f92e142fa1593f4555d6d89e3044a9b7",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/a17f8a17c20e8614c15b8e116e2f4bcde102cfab",
+                "reference": "a17f8a17c20e8614c15b8e116e2f4bcde102cfab",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=5.3.9"
+            },
+            "require-dev": {
+                "symfony/phpunit-bridge": "~2.7"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.6-dev"
+                    "dev-master": "2.7-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
+                "psr-4": {
                     "Symfony\\Component\\Filesystem\\": ""
                 }
             },
@@ -597,45 +610,47 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony Filesystem Component",
-            "homepage": "http://symfony.com",
-            "time": "2015-01-03 21:13:09"
+            "homepage": "https://symfony.com",
+            "time": "2015-09-09 17:42:36"
         },
         {
             "name": "symfony/yaml",
-            "version": "v2.6.4",
-            "target-dir": "Symfony/Component/Yaml",
+            "version": "v2.7.5",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/Yaml.git",
-                "reference": "60ed7751671113cf1ee7d7778e691642c2e9acd8"
+                "url": "https://github.com/symfony/yaml.git",
+                "reference": "31cb2ad0155c95b88ee55fe12bc7ff92232c1770"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Yaml/zipball/60ed7751671113cf1ee7d7778e691642c2e9acd8",
-                "reference": "60ed7751671113cf1ee7d7778e691642c2e9acd8",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/31cb2ad0155c95b88ee55fe12bc7ff92232c1770",
+                "reference": "31cb2ad0155c95b88ee55fe12bc7ff92232c1770",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=5.3.9"
+            },
+            "require-dev": {
+                "symfony/phpunit-bridge": "~2.7"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.6-dev"
+                    "dev-master": "2.7-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
+                "psr-4": {
                     "Symfony\\Component\\Yaml\\": ""
                 }
             },
@@ -644,18 +659,18 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony Yaml Component",
-            "homepage": "http://symfony.com",
-            "time": "2015-01-25 04:39:26"
+            "homepage": "https://symfony.com",
+            "time": "2015-09-14 14:14:09"
         }
     ],
     "packages-dev": [
@@ -714,16 +729,16 @@
         },
         {
             "name": "doctrine/instantiator",
-            "version": "1.0.4",
+            "version": "1.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119"
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f976e5de371104877ebc89bd8fecb0019ed9c119",
-                "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
                 "shasum": ""
             },
             "require": {
@@ -734,7 +749,7 @@
                 "ext-pdo": "*",
                 "ext-phar": "*",
                 "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "2.0.*@ALPHA"
+                "squizlabs/php_codesniffer": "~2.0"
             },
             "type": "library",
             "extra": {
@@ -743,8 +758,8 @@
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Doctrine\\Instantiator\\": "src"
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -764,30 +779,78 @@
                 "constructor",
                 "instantiate"
             ],
-            "time": "2014-10-13 12:58:55"
+            "time": "2015-06-14 21:17:01"
         },
         {
-            "name": "pdepend/pdepend",
-            "version": "2.0.4",
+            "name": "jakub-onderka/php-parallel-lint",
+            "version": "v0.8",
             "source": {
                 "type": "git",
-                "url": "https://github.com/pdepend/pdepend.git",
-                "reference": "1b0acf162da4f30237987e61e177a57f78e3d87e"
+                "url": "https://github.com/JakubOnderka/PHP-Parallel-Lint.git",
+                "reference": "2b242dcdbdd7369d2a746518ac31bb30c514b728"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/1b0acf162da4f30237987e61e177a57f78e3d87e",
-                "reference": "1b0acf162da4f30237987e61e177a57f78e3d87e",
+                "url": "https://api.github.com/repos/JakubOnderka/PHP-Parallel-Lint/zipball/2b242dcdbdd7369d2a746518ac31bb30c514b728",
+                "reference": "2b242dcdbdd7369d2a746518ac31bb30c514b728",
                 "shasum": ""
             },
             "require": {
-                "symfony/config": ">=2.4",
-                "symfony/dependency-injection": ">=2.4",
-                "symfony/filesystem": ">=2.4"
+                "php": ">=5.3.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "4.*@stable",
-                "squizlabs/php_codesniffer": "@stable"
+                "jakub-onderka/php-console-highlighter": "~0.3",
+                "nette/tester": "~1.3"
+            },
+            "suggest": {
+                "jakub-onderka/php-console-highlighter": "Highlight syntax in code snippet"
+            },
+            "bin": [
+                "parallel-lint"
+            ],
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "./"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD"
+            ],
+            "authors": [
+                {
+                    "name": "Jakub Onderka",
+                    "email": "jakub.onderka@gmail.com"
+                }
+            ],
+            "description": "This tool check syntax of PHP files about 20x faster than serial check.",
+            "homepage": "https://github.com/JakubOnderka/PHP-Parallel-Lint",
+            "time": "2014-10-05 10:19:39"
+        },
+        {
+            "name": "pdepend/pdepend",
+            "version": "2.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pdepend/pdepend.git",
+                "reference": "a77b6bede0afdd232155eb6f1de0b2826bcf2803"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/a77b6bede0afdd232155eb6f1de0b2826bcf2803",
+                "reference": "a77b6bede0afdd232155eb6f1de0b2826bcf2803",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.7",
+                "symfony/config": "^2.3.0",
+                "symfony/dependency-injection": "^2.3.0",
+                "symfony/filesystem": "^2.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.0.0",
+                "squizlabs/php_codesniffer": "^2.0.0"
             },
             "bin": [
                 "src/bin/pdepend"
@@ -803,7 +866,7 @@
                 "BSD-3-Clause"
             ],
             "description": "Official version of pdepend to be handled with Composer",
-            "time": "2014-12-04 12:38:39"
+            "time": "2015-09-24 14:17:05"
         },
         {
             "name": "phpdocumentor/reflection-docblock",
@@ -856,24 +919,27 @@
         },
         {
             "name": "phploc/phploc",
-            "version": "2.0.6",
+            "version": "2.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phploc.git",
-                "reference": "322ad07c112d5c6832abed4269d648cacff5959b"
+                "reference": "6cdf01336c06d20825831fe8cee70764fe373585"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phploc/zipball/322ad07c112d5c6832abed4269d648cacff5959b",
-                "reference": "322ad07c112d5c6832abed4269d648cacff5959b",
+                "url": "https://api.github.com/repos/sebastianbergmann/phploc/zipball/6cdf01336c06d20825831fe8cee70764fe373585",
+                "reference": "6cdf01336c06d20825831fe8cee70764fe373585",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3",
                 "sebastian/finder-facade": "~1.1",
-                "sebastian/git": "~1.0",
-                "sebastian/version": "~1.0",
-                "symfony/console": "~2.2"
+                "sebastian/git": "~2.0",
+                "sebastian/version": "~1.0.3",
+                "symfony/console": "~2.5"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4"
             },
             "bin": [
                 "phploc"
@@ -881,7 +947,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "2.1-dev"
                 }
             },
             "autoload": {
@@ -902,31 +968,29 @@
             ],
             "description": "A tool for quickly measuring the size of a PHP project.",
             "homepage": "https://github.com/sebastianbergmann/phploc",
-            "time": "2014-06-25 08:11:02"
+            "time": "2015-08-04 07:41:00"
         },
         {
             "name": "phpmd/phpmd",
-            "version": "2.2.0",
+            "version": "2.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpmd/phpmd.git",
-                "reference": "580e6ca75b472a844389ab8df7a0b412901d0d91"
+                "reference": "08b5bcd454a7148579b68931fc500d824afd3bb5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/580e6ca75b472a844389ab8df7a0b412901d0d91",
-                "reference": "580e6ca75b472a844389ab8df7a0b412901d0d91",
+                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/08b5bcd454a7148579b68931fc500d824afd3bb5",
+                "reference": "08b5bcd454a7148579b68931fc500d824afd3bb5",
                 "shasum": ""
             },
             "require": {
-                "pdepend/pdepend": "2.0.*",
-                "php": ">=5.3.0",
-                "symfony/config": ">=2.4",
-                "symfony/dependency-injection": ">=2.4",
-                "symfony/filesystem": ">=2.4"
+                "pdepend/pdepend": "~2.0",
+                "php": ">=5.3.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "*"
+                "phpunit/phpunit": "^4.0",
+                "squizlabs/php_codesniffer": "^2.0"
             },
             "bin": [
                 "src/bin/phpmd"
@@ -946,12 +1010,18 @@
                     "name": "Manuel Pichler",
                     "email": "github@manuel-pichler.de",
                     "homepage": "https://github.com/manuelpichler",
-                    "role": "Project founder"
+                    "role": "Project Founder"
                 },
                 {
                     "name": "Other contributors",
                     "homepage": "https://github.com/phpmd/phpmd/graphs/contributors",
                     "role": "Contributors"
+                },
+                {
+                    "name": "Marc Würth",
+                    "email": "ravage@bluewin.ch",
+                    "homepage": "https://github.com/ravage84",
+                    "role": "Project Maintainer"
                 }
             ],
             "description": "PHPMD is a spin-off project of PHP Depend and aims to be a PHP equivalent of the well known Java tool PMD.",
@@ -963,25 +1033,26 @@
                 "phpmd",
                 "pmd"
             ],
-            "time": "2015-01-25 13:46:59"
+            "time": "2015-09-24 14:37:49"
         },
         {
             "name": "phpspec/prophecy",
-            "version": "v1.3.1",
+            "version": "v1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "9ca52329bcdd1500de24427542577ebf3fc2f1c9"
+                "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/9ca52329bcdd1500de24427542577ebf3fc2f1c9",
-                "reference": "9ca52329bcdd1500de24427542577ebf3fc2f1c9",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4745ded9307786b730d7a60df5cb5a6c43cf95f7",
+                "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "~1.0,>=1.0.2",
-                "phpdocumentor/reflection-docblock": "~2.0"
+                "doctrine/instantiator": "^1.0.2",
+                "phpdocumentor/reflection-docblock": "~2.0",
+                "sebastian/comparator": "~1.1"
             },
             "require-dev": {
                 "phpspec/phpspec": "~2.0"
@@ -989,7 +1060,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.2.x-dev"
+                    "dev-master": "1.4.x-dev"
                 }
             },
             "autoload": {
@@ -1013,7 +1084,7 @@
                 }
             ],
             "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "http://phpspec.org",
+            "homepage": "https://github.com/phpspec/prophecy",
             "keywords": [
                 "Double",
                 "Dummy",
@@ -1022,20 +1093,20 @@
                 "spy",
                 "stub"
             ],
-            "time": "2014-11-17 16:23:49"
+            "time": "2015-08-13 10:07:40"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "2.0.15",
+            "version": "2.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "34cc484af1ca149188d0d9e91412191e398e0b67"
+                "reference": "ef1ca6835468857944d5c3b48fa503d5554cff2f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/34cc484af1ca149188d0d9e91412191e398e0b67",
-                "reference": "34cc484af1ca149188d0d9e91412191e398e0b67",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ef1ca6835468857944d5c3b48fa503d5554cff2f",
+                "reference": "ef1ca6835468857944d5c3b48fa503d5554cff2f",
                 "shasum": ""
             },
             "require": {
@@ -1043,7 +1114,7 @@
                 "phpunit/php-file-iterator": "~1.3",
                 "phpunit/php-text-template": "~1.2",
                 "phpunit/php-token-stream": "~1.3",
-                "sebastian/environment": "~1.0",
+                "sebastian/environment": "^1.3.2",
                 "sebastian/version": "~1.0"
             },
             "require-dev": {
@@ -1058,7 +1129,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "2.2.x-dev"
                 }
             },
             "autoload": {
@@ -1084,35 +1155,37 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2015-01-24 10:06:35"
+            "time": "2015-09-14 06:51:16"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "1.3.4",
+            "version": "1.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb"
+                "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/acd690379117b042d1c8af1fafd61bde001bf6bb",
-                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
+                "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4.x-dev"
+                }
+            },
             "autoload": {
                 "classmap": [
-                    "File/"
+                    "src/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
             "license": [
                 "BSD-3-Clause"
             ],
@@ -1129,20 +1202,20 @@
                 "filesystem",
                 "iterator"
             ],
-            "time": "2013-10-10 15:34:57"
+            "time": "2015-06-21 13:08:43"
         },
         {
             "name": "phpunit/php-text-template",
-            "version": "1.2.0",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a"
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
-                "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
                 "shasum": ""
             },
             "require": {
@@ -1151,20 +1224,17 @@
             "type": "library",
             "autoload": {
                 "classmap": [
-                    "Text/"
+                    "src/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
             "license": [
                 "BSD-3-Clause"
             ],
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
+                    "email": "sebastian@phpunit.de",
                     "role": "lead"
                 }
             ],
@@ -1173,20 +1243,20 @@
             "keywords": [
                 "template"
             ],
-            "time": "2014-01-30 17:20:04"
+            "time": "2015-06-21 13:50:34"
         },
         {
             "name": "phpunit/php-timer",
-            "version": "1.0.5",
+            "version": "1.0.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c"
+                "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/19689d4354b295ee3d8c54b4f42c3efb69cbc17c",
-                "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3e82f4e9fc92665fafd9157568e4dcb01d014e5b",
+                "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b",
                 "shasum": ""
             },
             "require": {
@@ -1195,13 +1265,10 @@
             "type": "library",
             "autoload": {
                 "classmap": [
-                    "PHP/"
+                    "src/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
             "license": [
                 "BSD-3-Clause"
             ],
@@ -1217,20 +1284,20 @@
             "keywords": [
                 "timer"
             ],
-            "time": "2013-08-02 07:42:54"
+            "time": "2015-06-21 08:01:12"
         },
         {
             "name": "phpunit/php-token-stream",
-            "version": "1.4.0",
+            "version": "1.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "db32c18eba00b121c145575fcbcd4d4d24e6db74"
+                "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/db32c18eba00b121c145575fcbcd4d4d24e6db74",
-                "reference": "db32c18eba00b121c145575fcbcd4d4d24e6db74",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
+                "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
                 "shasum": ""
             },
             "require": {
@@ -1266,20 +1333,20 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2015-01-17 09:51:32"
+            "time": "2015-09-15 10:49:45"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "4.5.1",
+            "version": "4.8.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "d6429b0995b24a2d9dfe5587ee3a7071c1161af4"
+                "reference": "463163747474815c5ccd4ae12b5b355ec12158e8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d6429b0995b24a2d9dfe5587ee3a7071c1161af4",
-                "reference": "d6429b0995b24a2d9dfe5587ee3a7071c1161af4",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/463163747474815c5ccd4ae12b5b355ec12158e8",
+                "reference": "463163747474815c5ccd4ae12b5b355ec12158e8",
                 "shasum": ""
             },
             "require": {
@@ -1289,19 +1356,19 @@
                 "ext-reflection": "*",
                 "ext-spl": "*",
                 "php": ">=5.3.3",
-                "phpspec/prophecy": "~1.3,>=1.3.1",
-                "phpunit/php-code-coverage": "~2.0,>=2.0.11",
-                "phpunit/php-file-iterator": "~1.3.2",
+                "phpspec/prophecy": "^1.3.1",
+                "phpunit/php-code-coverage": "~2.1",
+                "phpunit/php-file-iterator": "~1.4",
                 "phpunit/php-text-template": "~1.2",
-                "phpunit/php-timer": "~1.0.2",
+                "phpunit/php-timer": ">=1.0.6",
                 "phpunit/phpunit-mock-objects": "~2.3",
                 "sebastian/comparator": "~1.1",
-                "sebastian/diff": "~1.1",
-                "sebastian/environment": "~1.2",
+                "sebastian/diff": "~1.2",
+                "sebastian/environment": "~1.3",
                 "sebastian/exporter": "~1.2",
                 "sebastian/global-state": "~1.0",
                 "sebastian/version": "~1.0",
-                "symfony/yaml": "~2.0"
+                "symfony/yaml": "~2.1|~3.0"
             },
             "suggest": {
                 "phpunit/php-invoker": "~1.1"
@@ -1312,7 +1379,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.5.x-dev"
+                    "dev-master": "4.8.x-dev"
                 }
             },
             "autoload": {
@@ -1338,29 +1405,30 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2015-03-29 09:24:05"
+            "time": "2015-10-01 09:14:30"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
-            "version": "2.3.0",
+            "version": "2.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "c63d2367247365f688544f0d500af90a11a44c65"
+                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/c63d2367247365f688544f0d500af90a11a44c65",
-                "reference": "c63d2367247365f688544f0d500af90a11a44c65",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983",
+                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "~1.0,>=1.0.1",
+                "doctrine/instantiator": "^1.0.2",
                 "php": ">=5.3.3",
-                "phpunit/php-text-template": "~1.2"
+                "phpunit/php-text-template": "~1.2",
+                "sebastian/exporter": "~1.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.3"
+                "phpunit/phpunit": "~4.4"
             },
             "suggest": {
                 "ext-soap": "*"
@@ -1393,20 +1461,20 @@
                 "mock",
                 "xunit"
             ],
-            "time": "2014-10-03 05:12:11"
+            "time": "2015-10-02 06:51:40"
         },
         {
             "name": "sebastian/comparator",
-            "version": "1.1.1",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "1dd8869519a225f7f2b9eb663e225298fade819e"
+                "reference": "937efb279bd37a375bcadf584dec0726f84dbf22"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1dd8869519a225f7f2b9eb663e225298fade819e",
-                "reference": "1dd8869519a225f7f2b9eb663e225298fade819e",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22",
+                "reference": "937efb279bd37a375bcadf584dec0726f84dbf22",
                 "shasum": ""
             },
             "require": {
@@ -1420,7 +1488,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1.x-dev"
+                    "dev-master": "1.2.x-dev"
                 }
             },
             "autoload": {
@@ -1457,20 +1525,20 @@
                 "compare",
                 "equality"
             ],
-            "time": "2015-01-29 16:28:08"
+            "time": "2015-07-26 15:48:44"
         },
         {
             "name": "sebastian/diff",
-            "version": "1.2.0",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "5843509fed39dee4b356a306401e9dd1a931fec7"
+                "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/5843509fed39dee4b356a306401e9dd1a931fec7",
-                "reference": "5843509fed39dee4b356a306401e9dd1a931fec7",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/863df9687835c62aa423a22412d26fa2ebde3fd3",
+                "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3",
                 "shasum": ""
             },
             "require": {
@@ -1482,7 +1550,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.2-dev"
+                    "dev-master": "1.3-dev"
                 }
             },
             "autoload": {
@@ -1509,32 +1577,32 @@
             "keywords": [
                 "diff"
             ],
-            "time": "2014-08-15 10:29:00"
+            "time": "2015-02-22 15:13:53"
         },
         {
             "name": "sebastian/environment",
-            "version": "1.2.1",
+            "version": "1.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "6e6c71d918088c251b181ba8b3088af4ac336dd7"
+                "reference": "6324c907ce7a52478eeeaede764f48733ef5ae44"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6e6c71d918088c251b181ba8b3088af4ac336dd7",
-                "reference": "6e6c71d918088c251b181ba8b3088af4ac336dd7",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6324c907ce7a52478eeeaede764f48733ef5ae44",
+                "reference": "6324c907ce7a52478eeeaede764f48733ef5ae44",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.3"
+                "phpunit/phpunit": "~4.4"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.2.x-dev"
+                    "dev-master": "1.3.x-dev"
                 }
             },
             "autoload": {
@@ -1559,20 +1627,20 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2014-10-25 08:00:45"
+            "time": "2015-08-03 06:14:51"
         },
         {
             "name": "sebastian/exporter",
-            "version": "1.2.0",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "84839970d05254c73cde183a721c7af13aede943"
+                "reference": "7ae5513327cb536431847bcc0c10edba2701064e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/84839970d05254c73cde183a721c7af13aede943",
-                "reference": "84839970d05254c73cde183a721c7af13aede943",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/7ae5513327cb536431847bcc0c10edba2701064e",
+                "reference": "7ae5513327cb536431847bcc0c10edba2701064e",
                 "shasum": ""
             },
             "require": {
@@ -1625,25 +1693,25 @@
                 "export",
                 "exporter"
             ],
-            "time": "2015-01-27 07:23:06"
+            "time": "2015-06-21 07:55:53"
         },
         {
             "name": "sebastian/finder-facade",
-            "version": "1.1.0",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/finder-facade.git",
-                "reference": "1e396fda3449fce9df032749fa4fa2619e0347e0"
+                "reference": "a520dcc3dd39160eea480daa3426f4fd419a327b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/finder-facade/zipball/1e396fda3449fce9df032749fa4fa2619e0347e0",
-                "reference": "1e396fda3449fce9df032749fa4fa2619e0347e0",
+                "url": "https://api.github.com/repos/sebastianbergmann/finder-facade/zipball/a520dcc3dd39160eea480daa3426f4fd419a327b",
+                "reference": "a520dcc3dd39160eea480daa3426f4fd419a327b",
                 "shasum": ""
             },
             "require": {
-                "symfony/finder": ">=2.2.0",
-                "theseer/fdomdocument": ">=1.3.1"
+                "symfony/finder": "~2.3",
+                "theseer/fdomdocument": "~1.3"
             },
             "type": "library",
             "autoload": {
@@ -1664,20 +1732,20 @@
             ],
             "description": "FinderFacade is a convenience wrapper for Symfony's Finder component.",
             "homepage": "https://github.com/sebastianbergmann/finder-facade",
-            "time": "2013-05-28 06:10:03"
+            "time": "2015-06-04 08:11:58"
         },
         {
             "name": "sebastian/git",
-            "version": "1.2.0",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/git.git",
-                "reference": "a99fbc102e982c1404041ef3e4d431562b29bcba"
+                "reference": "2d5c139d0eedcb9e67e0e9ca08023be6e9b7b47b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/git/zipball/a99fbc102e982c1404041ef3e4d431562b29bcba",
-                "reference": "a99fbc102e982c1404041ef3e4d431562b29bcba",
+                "url": "https://api.github.com/repos/sebastianbergmann/git/zipball/2d5c139d0eedcb9e67e0e9ca08023be6e9b7b47b",
+                "reference": "2d5c139d0eedcb9e67e0e9ca08023be6e9b7b47b",
                 "shasum": ""
             },
             "require": {
@@ -1686,7 +1754,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.2-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -1701,8 +1769,7 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
+                    "email": "sebastian@phpunit.de"
                 }
             ],
             "description": "Simple wrapper for Git",
@@ -1710,7 +1777,7 @@
             "keywords": [
                 "git"
             ],
-            "time": "2013-08-04 09:35:29"
+            "time": "2015-04-06 16:23:43"
         },
         {
             "name": "sebastian/global-state",
@@ -1765,16 +1832,16 @@
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "1.0.0",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "3989662bbb30a29d20d9faa04a846af79b276252"
+                "reference": "994d4a811bafe801fb06dccbee797863ba2792ba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/3989662bbb30a29d20d9faa04a846af79b276252",
-                "reference": "3989662bbb30a29d20d9faa04a846af79b276252",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/994d4a811bafe801fb06dccbee797863ba2792ba",
+                "reference": "994d4a811bafe801fb06dccbee797863ba2792ba",
                 "shasum": ""
             },
             "require": {
@@ -1814,20 +1881,20 @@
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2015-01-24 09:48:32"
+            "time": "2015-06-21 08:04:50"
         },
         {
             "name": "sebastian/version",
-            "version": "1.0.4",
+            "version": "1.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "a77d9123f8e809db3fbdea15038c27a95da4058b"
+                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/a77d9123f8e809db3fbdea15038c27a95da4058b",
-                "reference": "a77d9123f8e809db3fbdea15038c27a95da4058b",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
+                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
                 "shasum": ""
             },
             "type": "library",
@@ -1849,20 +1916,20 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2014-12-15 14:25:24"
+            "time": "2015-06-21 13:59:46"
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "2.3.0",
+            "version": "2.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "5046b0e01c416fc2b06df961d0673c85bcdc896c"
+                "reference": "11a2545c44a5915f883e2e5ec12e14ed345e3ab2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/5046b0e01c416fc2b06df961d0673c85bcdc896c",
-                "reference": "5046b0e01c416fc2b06df961d0673c85bcdc896c",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/11a2545c44a5915f883e2e5ec12e14ed345e3ab2",
+                "reference": "11a2545c44a5915f883e2e5ec12e14ed345e3ab2",
                 "shasum": ""
             },
             "require": {
@@ -1923,25 +1990,24 @@
                 "phpcs",
                 "standards"
             ],
-            "time": "2015-03-04 02:07:03"
+            "time": "2015-09-09 00:18:50"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v2.6.4",
-            "target-dir": "Symfony/Component/DependencyInjection",
+            "version": "v2.7.5",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/DependencyInjection.git",
-                "reference": "42bbb43fab66292a1865dc9616c299904c3d4d14"
+                "url": "https://github.com/symfony/dependency-injection.git",
+                "reference": "422c3819b110f610d79c6f1dc38af23787dc790e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/42bbb43fab66292a1865dc9616c299904c3d4d14",
-                "reference": "42bbb43fab66292a1865dc9616c299904c3d4d14",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/422c3819b110f610d79c6f1dc38af23787dc790e",
+                "reference": "422c3819b110f610d79c6f1dc38af23787dc790e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=5.3.9"
             },
             "conflict": {
                 "symfony/expression-language": "<2.6"
@@ -1949,6 +2015,7 @@
             "require-dev": {
                 "symfony/config": "~2.2",
                 "symfony/expression-language": "~2.6",
+                "symfony/phpunit-bridge": "~2.7",
                 "symfony/yaml": "~2.1"
             },
             "suggest": {
@@ -1959,11 +2026,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.6-dev"
+                    "dev-master": "2.7-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
+                "psr-4": {
                     "Symfony\\Component\\DependencyInjection\\": ""
                 }
             },
@@ -1972,45 +2039,47 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony DependencyInjection Component",
-            "homepage": "http://symfony.com",
-            "time": "2015-01-25 04:39:26"
+            "homepage": "https://symfony.com",
+            "time": "2015-09-15 08:30:42"
         },
         {
             "name": "symfony/finder",
-            "version": "v2.6.4",
-            "target-dir": "Symfony/Component/Finder",
+            "version": "v2.7.5",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/Finder.git",
-                "reference": "16513333bca64186c01609961a2bb1b95b5e1355"
+                "url": "https://github.com/symfony/finder.git",
+                "reference": "8262ab605973afbb3ef74b945daabf086f58366f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Finder/zipball/16513333bca64186c01609961a2bb1b95b5e1355",
-                "reference": "16513333bca64186c01609961a2bb1b95b5e1355",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/8262ab605973afbb3ef74b945daabf086f58366f",
+                "reference": "8262ab605973afbb3ef74b945daabf086f58366f",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=5.3.9"
+            },
+            "require-dev": {
+                "symfony/phpunit-bridge": "~2.7"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.6-dev"
+                    "dev-master": "2.7-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
+                "psr-4": {
                     "Symfony\\Component\\Finder\\": ""
                 }
             },
@@ -2019,31 +2088,31 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony Finder Component",
-            "homepage": "http://symfony.com",
-            "time": "2015-01-03 08:01:59"
+            "homepage": "https://symfony.com",
+            "time": "2015-09-19 19:59:23"
         },
         {
             "name": "theseer/fdomdocument",
-            "version": "1.6.0",
+            "version": "1.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/fDOMDocument.git",
-                "reference": "d08cf070350f884c63fc9078d27893c2ab6c7cef"
+                "reference": "d9ad139d6c2e8edf5e313ffbe37ff13344cf0684"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/fDOMDocument/zipball/d08cf070350f884c63fc9078d27893c2ab6c7cef",
-                "reference": "d08cf070350f884c63fc9078d27893c2ab6c7cef",
+                "url": "https://api.github.com/repos/theseer/fDOMDocument/zipball/d9ad139d6c2e8edf5e313ffbe37ff13344cf0684",
+                "reference": "d9ad139d6c2e8edf5e313ffbe37ff13344cf0684",
                 "shasum": ""
             },
             "require": {
@@ -2070,7 +2139,7 @@
             ],
             "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.",
             "homepage": "https://github.com/theseer/fDOMDocument",
-            "time": "2014-09-13 10:57:19"
+            "time": "2015-05-27 22:58:02"
         }
     ],
     "aliases": [],
diff --git a/console b/console
index 36645768..412dbbdb 100755
--- a/console
+++ b/console
@@ -21,6 +21,7 @@ use PHPCI\Command\DaemonCommand;
 use PHPCI\Command\PollCommand;
 use PHPCI\Command\CreateAdminCommand;
 use PHPCI\Command\CreateBuildCommand;
+use PHPCI\Command\WorkerCommand;
 use PHPCI\Service\BuildService;
 use Symfony\Component\Console\Application;
 use b8\Store\Factory;
@@ -36,5 +37,6 @@ $application->add(new DaemonCommand($loggerConfig->getFor('DaemonCommand')));
 $application->add(new PollCommand($loggerConfig->getFor('PollCommand')));
 $application->add(new CreateAdminCommand(Factory::getStore('User')));
 $application->add(new CreateBuildCommand(Factory::getStore('Project'), new BuildService(Factory::getStore('Build'))));
+$application->add(new WorkerCommand($loggerConfig->getFor('WorkerCommand')));
 
 $application->run();

From 183d7d9e50da55295874a2ff610c9dfaf81385e7 Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Mon, 5 Oct 2015 14:07:48 +0100
Subject: [PATCH 235/329] Making duplicate builds work again.

---
 PHPCI/Service/BuildService.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/PHPCI/Service/BuildService.php b/PHPCI/Service/BuildService.php
index ed1ed6c3..56eb76ed 100644
--- a/PHPCI/Service/BuildService.php
+++ b/PHPCI/Service/BuildService.php
@@ -114,7 +114,13 @@ class BuildService
         $build->setCreated(new \DateTime());
         $build->setStatus(0);
 
-        return $this->buildStore->save($build);
+        $build = $this->buildStore->save($build);
+
+        $build = BuildFactory::getBuild($build);
+        $build->sendStatusPostback();
+        $this->addBuildToQueue($build);
+
+        return $build;
     }
 
     /**

From b2ed9f102b19187b812c0ad49a456b5fa81667f2 Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Mon, 5 Oct 2015 14:11:43 +0100
Subject: [PATCH 236/329] Docblock fixes

---
 PHPCI/Service/BuildService.php | 5 ++++-
 PHPCI/Worker/BuildWorker.php   | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/PHPCI/Service/BuildService.php b/PHPCI/Service/BuildService.php
index 56eb76ed..94eb9792 100644
--- a/PHPCI/Service/BuildService.php
+++ b/PHPCI/Service/BuildService.php
@@ -134,7 +134,10 @@ class BuildService
         return $this->buildStore->delete($build);
     }
 
-
+    /**
+     * Takes a build and puts it into the queue to be run (if using a queue)
+     * @param Build $build
+     */
     public function addBuildToQueue(Build $build)
     {
         $config = Config::getInstance();
diff --git a/PHPCI/Worker/BuildWorker.php b/PHPCI/Worker/BuildWorker.php
index 9d13ffdd..cc070a76 100644
--- a/PHPCI/Worker/BuildWorker.php
+++ b/PHPCI/Worker/BuildWorker.php
@@ -12,7 +12,10 @@ use PHPCI\BuildFactory;
 use PHPCI\Logging\BuildDBLogHandler;
 use PHPCI\Model\Build;
 
-
+/**
+ * Class BuildWorker
+ * @package PHPCI\Worker
+ */
 class BuildWorker
 {
     /**

From ea1157066e1904b7d7f02270acdb2e731375015e Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Mon, 5 Oct 2015 14:17:13 +0100
Subject: [PATCH 237/329] Fixing new PHPCS errors.

---
 PHPCI/BuildFactory.php            | 3 +--
 PHPCI/Helper/MailerFactory.php    | 2 +-
 PHPCI/Model/Build/GithubBuild.php | 3 +--
 PHPCI/Plugin/PackageBuild.php     | 3 +--
 PHPCI/ProcessControl/Factory.php  | 2 +-
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/PHPCI/BuildFactory.php b/PHPCI/BuildFactory.php
index ecc37c43..c7bad338 100644
--- a/PHPCI/BuildFactory.php
+++ b/PHPCI/BuildFactory.php
@@ -41,8 +41,7 @@ class BuildFactory
     */
     public static function getBuild(Build $base)
     {
-        switch($base->getProject()->getType())
-        {
+        switch ($base->getProject()->getType()) {
             case 'remote':
                 $type = 'RemoteGitBuild';
                 break;
diff --git a/PHPCI/Helper/MailerFactory.php b/PHPCI/Helper/MailerFactory.php
index 641c06b9..c84c068d 100644
--- a/PHPCI/Helper/MailerFactory.php
+++ b/PHPCI/Helper/MailerFactory.php
@@ -71,7 +71,7 @@ class MailerFactory
         } else {
             // Check defaults
 
-            switch($configName) {
+            switch ($configName) {
                 case 'smtp_address':
                     return "localhost";
                 case 'default_mailto_address':
diff --git a/PHPCI/Model/Build/GithubBuild.php b/PHPCI/Model/Build/GithubBuild.php
index b5d8ccbb..0ae3b9e0 100644
--- a/PHPCI/Model/Build/GithubBuild.php
+++ b/PHPCI/Model/Build/GithubBuild.php
@@ -54,8 +54,7 @@ class GithubBuild extends RemoteGitBuild
         $url    = 'https://api.github.com/repos/'.$project->getReference().'/statuses/'.$this->getCommitId();
         $http   = new \b8\HttpClient();
 
-        switch($this->getStatus())
-        {
+        switch ($this->getStatus()) {
             case 0:
             case 1:
                 $status = 'pending';
diff --git a/PHPCI/Plugin/PackageBuild.php b/PHPCI/Plugin/PackageBuild.php
index 8e40c71f..09e4de0d 100644
--- a/PHPCI/Plugin/PackageBuild.php
+++ b/PHPCI/Plugin/PackageBuild.php
@@ -69,8 +69,7 @@ class PackageBuild implements \PHPCI\Plugin
         }
 
         foreach ($this->format as $format) {
-            switch($format)
-            {
+            switch ($format) {
                 case 'tar':
                     $cmd = 'tar cfz "%s/%s.tar.gz" ./*';
                     break;
diff --git a/PHPCI/ProcessControl/Factory.php b/PHPCI/ProcessControl/Factory.php
index a1aa2354..7622fd49 100644
--- a/PHPCI/ProcessControl/Factory.php
+++ b/PHPCI/ProcessControl/Factory.php
@@ -47,7 +47,7 @@ class Factory
      */
     public static function createProcessControl()
     {
-        switch(true) {
+        switch (true) {
             case PosixProcessControl::isAvailable():
                 return new PosixProcessControl();
 

From 771bee0aa3396d2f386bbfea01d4c7ee0194ab0c Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Mon, 5 Oct 2015 14:41:13 +0100
Subject: [PATCH 238/329] Fixings

---
 PHPCI/BuildFactory.php            | 21 ++++++++++++++++-----
 PHPCI/Model/Build/GithubBuild.php | 18 +++++++++++++-----
 PHPCI/Service/BuildService.php    |  8 +++++++-
 3 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/PHPCI/BuildFactory.php b/PHPCI/BuildFactory.php
index c7bad338..fb20309d 100644
--- a/PHPCI/BuildFactory.php
+++ b/PHPCI/BuildFactory.php
@@ -36,12 +36,17 @@ class BuildFactory
 
     /**
     * Takes a generic build and returns a type-specific build model.
-    * @param Build $base The build from which to get a more specific build type.
+    * @param Build $build The build from which to get a more specific build type.
+    * @param string $type Set the type manually if you already know it.
     * @return Build
     */
-    public static function getBuild(Build $base)
+    public static function getBuild(Build $build, $type = null)
     {
-        switch ($base->getProject()->getType()) {
+        if (is_null($type) && !is_null($build->getProject())) {
+            $type = $build->getProject()->getType();
+        }
+
+        switch ($type) {
             case 'remote':
                 $type = 'RemoteGitBuild';
                 break;
@@ -63,10 +68,16 @@ class BuildFactory
             case 'svn':
                 $type = 'SubversionBuild';
                 break;
+            default:
+                $type = null;
+                break;
         }
 
-        $type = '\\PHPCI\\Model\\Build\\' . $type;
+        if (!is_null($type)) {
+            $type = '\\PHPCI\\Model\\Build\\' . $type;
+            $build = new $type($build->getDataArray());
+        }
 
-        return new $type($base->getDataArray());
+        return $build;
     }
 }
diff --git a/PHPCI/Model/Build/GithubBuild.php b/PHPCI/Model/Build/GithubBuild.php
index 0ae3b9e0..130d7acb 100644
--- a/PHPCI/Model/Build/GithubBuild.php
+++ b/PHPCI/Model/Build/GithubBuild.php
@@ -45,12 +45,16 @@ class GithubBuild extends RemoteGitBuild
     {
         $token = \b8\Config::getInstance()->get('phpci.github.token');
 
-        if (empty($token)) {
+        if (empty($token) || empty($this->data['id'])) {
             return;
         }
 
         $project    = $this->getProject();
 
+        if (empty($project)) {
+            return;
+        }
+
         $url    = 'https://api.github.com/repos/'.$project->getReference().'/statuses/'.$this->getCommitId();
         $http   = new \b8\HttpClient();
 
@@ -114,10 +118,14 @@ class GithubBuild extends RemoteGitBuild
     {
         $rtn = parent::getCommitMessage($this->data['commit_message']);
 
-        $reference = $this->getProject()->getReference();
-        $commitLink = '#$1';
-        $rtn = preg_replace('/\#([0-9]+)/', $commitLink, $rtn);
-        $rtn = preg_replace('/\@([a-zA-Z0-9_]+)/', '@$1', $rtn);
+        $project = $this->getProject();
+
+        if (!is_null($project)) {
+            $reference = $project->getReference();
+            $commitLink = '#$1';
+            $rtn = preg_replace('/\#([0-9]+)/', $commitLink, $rtn);
+            $rtn = preg_replace('/\@([a-zA-Z0-9_]+)/', '@$1', $rtn);
+        }
 
         return $rtn;
     }
diff --git a/PHPCI/Service/BuildService.php b/PHPCI/Service/BuildService.php
index 94eb9792..3f03f559 100644
--- a/PHPCI/Service/BuildService.php
+++ b/PHPCI/Service/BuildService.php
@@ -87,7 +87,7 @@ class BuildService
 
         $build = $this->buildStore->save($build);
 
-        $build = BuildFactory::getBuild($build);
+        $build = BuildFactory::getBuild($build, $project->getType());
         $build->sendStatusPostback();
         $this->addBuildToQueue($build);
 
@@ -140,6 +140,12 @@ class BuildService
      */
     public function addBuildToQueue(Build $build)
     {
+        $buildId = $build->getId();
+
+        if (empty($buildId)) {
+            return;
+        }
+
         $config = Config::getInstance();
 
         $settings = $config->get('phpci.worker', []);

From 11445304d6e77a38ef71ed50bbc2a530d7dc4ec8 Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Mon, 5 Oct 2015 14:48:17 +0100
Subject: [PATCH 239/329] Making PHPMD happy.

---
 PHPCI/BuildFactory.php         | 64 +++++++++++++++-------------------
 PHPCI/Service/BuildService.php |  2 +-
 2 files changed, 30 insertions(+), 36 deletions(-)

diff --git a/PHPCI/BuildFactory.php b/PHPCI/BuildFactory.php
index fb20309d..fdc8a212 100644
--- a/PHPCI/BuildFactory.php
+++ b/PHPCI/BuildFactory.php
@@ -37,45 +37,39 @@ class BuildFactory
     /**
     * Takes a generic build and returns a type-specific build model.
     * @param Build $build The build from which to get a more specific build type.
-    * @param string $type Set the type manually if you already know it.
     * @return Build
     */
-    public static function getBuild(Build $build, $type = null)
+    public static function getBuild(Build $build)
     {
-        if (is_null($type) && !is_null($build->getProject())) {
-            $type = $build->getProject()->getType();
-        }
+        $project = $build->getProject();
 
-        switch ($type) {
-            case 'remote':
-                $type = 'RemoteGitBuild';
-                break;
-            case 'local':
-                $type = 'LocalBuild';
-                break;
-            case 'github':
-                $type = 'GithubBuild';
-                break;
-            case 'bitbucket':
-                $type = 'BitbucketBuild';
-                break;
-            case 'gitlab':
-                $type = 'GitlabBuild';
-                break;
-            case 'hg':
-                $type = 'MercurialBuild';
-                break;
-            case 'svn':
-                $type = 'SubversionBuild';
-                break;
-            default:
-                $type = null;
-                break;
-        }
-
-        if (!is_null($type)) {
-            $type = '\\PHPCI\\Model\\Build\\' . $type;
-            $build = new $type($build->getDataArray());
+        if (!empty($project)) {
+            switch ($project->getType()) {
+                case 'remote':
+                    $type = 'RemoteGitBuild';
+                    break;
+                case 'local':
+                    $type = 'LocalBuild';
+                    break;
+                case 'github':
+                    $type = 'GithubBuild';
+                    break;
+                case 'bitbucket':
+                    $type = 'BitbucketBuild';
+                    break;
+                case 'gitlab':
+                    $type = 'GitlabBuild';
+                    break;
+                case 'hg':
+                    $type = 'MercurialBuild';
+                    break;
+                case 'svn':
+                    $type = 'SubversionBuild';
+                    break;
+            }
+            
+            $class = '\\PHPCI\\Model\\Build\\' . $type;
+            $build = new $class($build->getDataArray());
         }
 
         return $build;
diff --git a/PHPCI/Service/BuildService.php b/PHPCI/Service/BuildService.php
index 3f03f559..117b94e7 100644
--- a/PHPCI/Service/BuildService.php
+++ b/PHPCI/Service/BuildService.php
@@ -87,7 +87,7 @@ class BuildService
 
         $build = $this->buildStore->save($build);
 
-        $build = BuildFactory::getBuild($build, $project->getType());
+        $build = BuildFactory::getBuild($build);
         $build->sendStatusPostback();
         $this->addBuildToQueue($build);
 

From 9dd6edc24ab5d78a225fb2bfa9955bca4b540c9f Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Mon, 5 Oct 2015 15:07:25 +0100
Subject: [PATCH 240/329] Fix

---
 PHPCI/BuildFactory.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PHPCI/BuildFactory.php b/PHPCI/BuildFactory.php
index fdc8a212..1dbc4017 100644
--- a/PHPCI/BuildFactory.php
+++ b/PHPCI/BuildFactory.php
@@ -67,7 +67,7 @@ class BuildFactory
                     $type = 'SubversionBuild';
                     break;
             }
-            
+
             $class = '\\PHPCI\\Model\\Build\\' . $type;
             $build = new $class($build->getDataArray());
         }

From 90b4de453e1ef0b0911b0116310c236299a4138e Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Mon, 5 Oct 2015 15:25:45 +0100
Subject: [PATCH 241/329] Moving to new .phpci.yml filename

---
 phpci.yml => .phpci.yml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename phpci.yml => .phpci.yml (100%)

diff --git a/phpci.yml b/.phpci.yml
similarity index 100%
rename from phpci.yml
rename to .phpci.yml

From 668ee6761759f98efd230af03da8ec5f941db6e3 Mon Sep 17 00:00:00 2001
From: Adam Cooper 
Date: Tue, 6 Oct 2015 10:53:23 +0100
Subject: [PATCH 242/329] Incorrect docblock

The "optionally" is not true, the config file is now required.
---
 PHPCI/Plugin/Codeception.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PHPCI/Plugin/Codeception.php b/PHPCI/Plugin/Codeception.php
index 6d020210..79f05cdf 100644
--- a/PHPCI/Plugin/Codeception.php
+++ b/PHPCI/Plugin/Codeception.php
@@ -99,7 +99,7 @@ class Codeception implements \PHPCI\Plugin, \PHPCI\ZeroConfigPlugin
     }
 
     /**
-     * Runs Codeception tests, optionally using specified config file(s).
+     * Runs Codeception tests
      */
     public function execute()
     {

From 7e2fee95045c17597a7d07687664b400a8d45f6d Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Tue, 6 Oct 2015 11:38:09 +0100
Subject: [PATCH 243/329] Verify that jobs actually come from PHPCI

---
 PHPCI/Service/BuildService.php |  1 +
 PHPCI/Worker/BuildWorker.php   | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/PHPCI/Service/BuildService.php b/PHPCI/Service/BuildService.php
index 117b94e7..7db8d474 100644
--- a/PHPCI/Service/BuildService.php
+++ b/PHPCI/Service/BuildService.php
@@ -152,6 +152,7 @@ class BuildService
 
         if (!empty($settings['host']) && !empty($settings['queue'])) {
             $jobData = array(
+                'type' => 'phpci.build',
                 'build_id' => $build->getId(),
             );
 
diff --git a/PHPCI/Worker/BuildWorker.php b/PHPCI/Worker/BuildWorker.php
index cc070a76..33bccd9e 100644
--- a/PHPCI/Worker/BuildWorker.php
+++ b/PHPCI/Worker/BuildWorker.php
@@ -82,6 +82,7 @@ class BuildWorker
     {
         $pheanstalk = new Pheanstalk($this->host);
         $pheanstalk->watch($this->queue);
+        $pheanstalk->ignore('default');
         $buildStore = Factory::getStore('Build');
 
         $jobs = 0;
@@ -99,6 +100,19 @@ class BuildWorker
 
             // Get the job data and run the job:
             $jobData = json_decode($job->getData(), true);
+
+            if (empty($jobData) || !is_array($jobData)) {
+                // Probably not from PHPCI.
+                $pheanstalk->release($job);
+                continue;
+            }
+
+            if (!array_key_exists('type', $jobData) || $jobData['type'] !== 'phpci.build') {
+                // Probably not from PHPCI.
+                $pheanstalk->release($job);
+                continue;
+            }
+
             $this->logger->addInfo('Received build #'.$jobData['build_id'].' from Beanstalkd');
 
             // If the job comes with config data, reset our config and database connections

From de6eb62367203490efde74bd6beebb1a0f14f707 Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Tue, 6 Oct 2015 12:00:58 +0100
Subject: [PATCH 244/329] Deployer plugin

---
 PHPCI/Plugin/Deployer.php | 66 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 PHPCI/Plugin/Deployer.php

diff --git a/PHPCI/Plugin/Deployer.php b/PHPCI/Plugin/Deployer.php
new file mode 100644
index 00000000..62f51d0d
--- /dev/null
+++ b/PHPCI/Plugin/Deployer.php
@@ -0,0 +1,66 @@
+
+* @package      PHPCI
+* @subpackage   Plugins
+*/
+class Deployer implements \PHPCI\Plugin
+{
+    protected $webhookUrl;
+    protected $reason;
+
+    /**
+     * Set up the plugin, configure options, etc.
+     * @param Builder $phpci
+     * @param Build $build
+     * @param array $options
+     */
+    public function __construct(Builder $phpci, Build $build, array $options = array())
+    {
+        $this->phpci = $phpci;
+        $this->build = $build;
+        $this->reason = 'PHPCI Build #%BUILD%';
+
+        if (isset($options['webhook_url'])) {
+            $this->webhookUrl = $options['webhook_url'];
+        }
+
+        if (isset($options['reason'])) {
+            $this->reason = $options['reason'];
+        }
+    }
+
+    /**
+    * Copies files from the root of the build directory into the target folder
+    */
+    public function execute()
+    {
+        if (empty($this->webhookUrl)) {
+            $this->phpci->logFailure('You must specify a webhook URL.');
+            return false;
+        }
+
+        $http = new HttpClient();
+
+        $response = $http->post($this->webhookUrl, array(
+            'reason' => $this->phpci->interpolate($this->reason),
+        ));
+
+        return $response['success'];
+    }
+}

From 06e323596015f8a54edffcf64406715dbcf9f486 Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Tue, 6 Oct 2015 14:16:48 +0100
Subject: [PATCH 245/329] Add "source" and "url" parameters to Deployer plugin.

---
 PHPCI/Plugin/Deployer.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/PHPCI/Plugin/Deployer.php b/PHPCI/Plugin/Deployer.php
index 62f51d0d..bda55ff0 100644
--- a/PHPCI/Plugin/Deployer.php
+++ b/PHPCI/Plugin/Deployer.php
@@ -59,6 +59,8 @@ class Deployer implements \PHPCI\Plugin
 
         $response = $http->post($this->webhookUrl, array(
             'reason' => $this->phpci->interpolate($this->reason),
+            'source' => 'PHPCI',
+            'url' => $this->phpci->interpolate('%BUILD_URI%'),
         ));
 
         return $response['success'];

From 801a4f7309b75424396dc2971cc21ff7f6451a5e Mon Sep 17 00:00:00 2001
From: Stephen Ball 
Date: Tue, 6 Oct 2015 17:28:44 +0100
Subject: [PATCH 246/329] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 759f715d..a284c193 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ We have a chat room for discussing PHPCI, you can access it here: [![Gitter](htt
 * Multiple PHP-version tests. *(In progress)*
 * Multiple testing workers. *(In progress)*
 * Install PEAR or PECL extensions.
-* Deployments.
+* [Deployments](http://phpdeployment.org)
 
 ## Getting Started:
 We've got documentation on our website on [installing PHPCI](https://www.phptesting.org/install-phpci) and [adding support for PHPCI to your projects](https://www.phptesting.org/wiki/Adding-PHPCI-Support-to-Your-Projects).

From 857990b7761a2e257894f4e00568e9e28b177bf4 Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Tue, 6 Oct 2015 19:10:11 +0100
Subject: [PATCH 247/329] Update README.md

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index a284c193..b30439e5 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,6 @@ We have a chat room for discussing PHPCI, you can access it here: [![Gitter](htt
 ##What it doesn't do (yet):
 * Virtualised testing. *(In progress)*
 * Multiple PHP-version tests. *(In progress)*
-* Multiple testing workers. *(In progress)*
 * Install PEAR or PECL extensions.
 * [Deployments](http://phpdeployment.org)
 

From 6f0945fb97fc2e35df7c0fc70ab13230521fa0e5 Mon Sep 17 00:00:00 2001
From: Stephen Ball 
Date: Wed, 7 Oct 2015 15:06:07 +0100
Subject: [PATCH 248/329] Added the commit message to the BuildInterpolator so
 it can be used as the default reason passed to deployer

---
 PHPCI/Helper/BuildInterpolator.php | 3 +++
 PHPCI/Plugin/Deployer.php          | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/PHPCI/Helper/BuildInterpolator.php b/PHPCI/Helper/BuildInterpolator.php
index fbadbc30..1e7222bb 100644
--- a/PHPCI/Helper/BuildInterpolator.php
+++ b/PHPCI/Helper/BuildInterpolator.php
@@ -38,6 +38,7 @@ class BuildInterpolator
         $this->interpolation_vars['%COMMIT%'] = $build->getCommitId();
         $this->interpolation_vars['%SHORT_COMMIT%'] = substr($build->getCommitId(), 0, 7);
         $this->interpolation_vars['%COMMIT_EMAIL%'] = $build->getCommitterEmail();
+        $this->interpolation_vars['%COMMIT_MESSAGE%'] = $build->getCommitMessage();
         $this->interpolation_vars['%COMMIT_URI%'] = $build->getCommitLink();
         $this->interpolation_vars['%BRANCH%'] = $build->getBranch();
         $this->interpolation_vars['%BRANCH_URI%'] = $build->getBranchLink();
@@ -49,6 +50,7 @@ class BuildInterpolator
         $this->interpolation_vars['%BUILD_URI%'] = $phpCiUrl . "build/view/" . $build->getId();
         $this->interpolation_vars['%PHPCI_COMMIT%'] = $this->interpolation_vars['%COMMIT%'];
         $this->interpolation_vars['%PHPCI_SHORT_COMMIT%'] = $this->interpolation_vars['%SHORT_COMMIT%'];
+        $this->interpolation_vars['%PHPCI_COMMIT_MESSAGE%'] = $this->interpolation_vars['%COMMIT_MESSAGE%'];
         $this->interpolation_vars['%PHPCI_COMMIT_EMAIL%'] = $this->interpolation_vars['%COMMIT_EMAIL%'];
         $this->interpolation_vars['%PHPCI_COMMIT_URI%'] = $this->interpolation_vars['%COMMIT_URI%'];
         $this->interpolation_vars['%PHPCI_PROJECT%'] = $this->interpolation_vars['%PROJECT%'];
@@ -61,6 +63,7 @@ class BuildInterpolator
         putenv('PHPCI=1');
         putenv('PHPCI_COMMIT=' . $this->interpolation_vars['%COMMIT%']);
         putenv('PHPCI_SHORT_COMMIT=' . $this->interpolation_vars['%SHORT_COMMIT%']);
+        putenv('PHPCI_COMMIT_MESSAGE=' . $this->interpolation_vars['%COMMIT_MESSAGE%']);
         putenv('PHPCI_COMMIT_EMAIL=' . $this->interpolation_vars['%COMMIT_EMAIL%']);
         putenv('PHPCI_COMMIT_URI=' . $this->interpolation_vars['%COMMIT_URI%']);
         putenv('PHPCI_PROJECT=' . $this->interpolation_vars['%PROJECT%']);
diff --git a/PHPCI/Plugin/Deployer.php b/PHPCI/Plugin/Deployer.php
index bda55ff0..2db839e3 100644
--- a/PHPCI/Plugin/Deployer.php
+++ b/PHPCI/Plugin/Deployer.php
@@ -34,7 +34,7 @@ class Deployer implements \PHPCI\Plugin
     {
         $this->phpci = $phpci;
         $this->build = $build;
-        $this->reason = 'PHPCI Build #%BUILD%';
+        $this->reason = 'PHPCI Build #%BUILD% - %COMMIT_MESSAGE%';
 
         if (isset($options['webhook_url'])) {
             $this->webhookUrl = $options['webhook_url'];

From 2380d2e472c4bf6317cdca4e8c57a6abc7690c01 Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Thu, 8 Oct 2015 09:49:16 +0100
Subject: [PATCH 249/329] Build worker should delete jobs in its queue that are
 not recognised.

---
 PHPCI/Worker/BuildWorker.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PHPCI/Worker/BuildWorker.php b/PHPCI/Worker/BuildWorker.php
index 33bccd9e..e08fdd84 100644
--- a/PHPCI/Worker/BuildWorker.php
+++ b/PHPCI/Worker/BuildWorker.php
@@ -109,7 +109,7 @@ class BuildWorker
 
             if (!array_key_exists('type', $jobData) || $jobData['type'] !== 'phpci.build') {
                 // Probably not from PHPCI.
-                $pheanstalk->release($job);
+                $pheanstalk->delete($job);
                 continue;
             }
 

From e186874eba25b50f6e645eb33e00ea280a9a5aa2 Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Thu, 8 Oct 2015 16:29:29 +0100
Subject: [PATCH 250/329] Removing the ability to install 'plugins' via the web
 interface.

---
 PHPCI/Controller/PluginController.php | 144 -----------------
 PHPCI/View/Plugin/index.phtml         | 212 ++++----------------------
 2 files changed, 32 insertions(+), 324 deletions(-)

diff --git a/PHPCI/Controller/PluginController.php b/PHPCI/Controller/PluginController.php
index cefcdbb5..64cb1463 100644
--- a/PHPCI/Controller/PluginController.php
+++ b/PHPCI/Controller/PluginController.php
@@ -23,24 +23,6 @@ use PHPCI\Plugin\Util\PluginInformationCollection;
  */
 class PluginController extends \PHPCI\Controller
 {
-    protected $required = array(
-        'php',
-        'ext-pdo',
-        'ext-pdo_mysql',
-        'block8/b8framework',
-        'ircmaxell/password-compat',
-        'swiftmailer/swiftmailer',
-        'symfony/yaml',
-        'symfony/console',
-        'psr/log',
-        'monolog/monolog',
-        'pimple/pimple',
-        'robmorgan/phinx',
-    );
-
-    protected $canInstall;
-    protected $composerPath;
-
     /**
      * List all enabled plugins, installed and recommend packages.
      * @return string
@@ -49,12 +31,8 @@ class PluginController extends \PHPCI\Controller
     {
         $this->requireAdmin();
 
-        $this->view->canWrite = is_writable(APPLICATION_PATH . 'composer.json');
-        $this->view->required = $this->required;
-
         $json = $this->getComposerJson();
         $this->view->installedPackages = $json['require'];
-        $this->view->suggestedPackages = $json['suggest'];
 
         $pluginInfo = new PluginInformationCollection();
         $pluginInfo->add(FilesPluginInformation::newFromDir(
@@ -71,49 +49,6 @@ class PluginController extends \PHPCI\Controller
         return $this->view->render();
     }
 
-    /**
-     * Remove a given package.
-     */
-    public function remove()
-    {
-        $this->requireAdmin();
-
-        $package = $this->getParam('package', null);
-        $json = $this->getComposerJson();
-
-        $response = new b8\Http\Response\RedirectResponse();
-
-        if (!in_array($package, $this->required)) {
-            unset($json['require'][$package]);
-            $this->setComposerJson($json);
-
-            $response->setHeader('Location', PHPCI_URL . 'plugin?r=' . $package);
-            return $response;
-        }
-
-        $response->setHeader('Location', PHPCI_URL);
-        return $response;
-    }
-
-    /**
-     * Install a given package.
-     */
-    public function install()
-    {
-        $this->requireAdmin();
-
-        $package = $this->getParam('package', null);
-        $version = $this->getParam('version', '*');
-
-        $json = $this->getComposerJson();
-        $json['require'][$package] = $version;
-        $this->setComposerJson($json);
-
-        $response = new b8\Http\Response\RedirectResponse();
-        $response->setHeader('Location', PHPCI_URL . 'plugin?w=' . $package);
-        return $response;
-    }
-
     /**
      * Get the json-decoded contents of the composer.json file.
      * @return mixed
@@ -123,83 +58,4 @@ class PluginController extends \PHPCI\Controller
         $json = file_get_contents(APPLICATION_PATH . 'composer.json');
         return json_decode($json, true);
     }
-
-    /**
-     * Convert array to json and save composer.json
-     *
-     * @param $array
-     */
-    protected function setComposerJson($array)
-    {
-        if (defined('JSON_PRETTY_PRINT')) {
-            $json = json_encode($array, JSON_PRETTY_PRINT);
-        } else {
-            $json = json_encode($array);
-        }
-
-        file_put_contents(APPLICATION_PATH . 'composer.json', $json);
-    }
-
-    /**
-     * Find a system binary.
-     * @param $binary
-     * @return null|string
-     */
-    protected function findBinary($binary)
-    {
-        if (is_string($binary)) {
-            $binary = array($binary);
-        }
-
-        foreach ($binary as $bin) {
-            // Check project root directory:
-            if (is_file(APPLICATION_PATH . $bin)) {
-                return APPLICATION_PATH . $bin;
-            }
-
-            // Check Composer bin dir:
-            if (is_file(APPLICATION_PATH . 'vendor/bin/' . $bin)) {
-                return APPLICATION_PATH . 'vendor/bin/' . $bin;
-            }
-
-            // Use "which"
-            $which = trim(shell_exec('which ' . $bin));
-
-            if (!empty($which)) {
-                return $which;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Perform a search on packagist.org.
-     */
-    public function packagistSearch()
-    {
-        $searchQuery = $this->getParam('q', '');
-        $http = new \b8\HttpClient();
-        $http->setHeaders(array('User-Agent: PHPCI/1.0 (+https://www.phptesting.org)'));
-        $res = $http->get('https://packagist.org/search.json', array('q' => $searchQuery));
-
-        $response = new b8\Http\Response\JsonResponse();
-        $response->setContent($res['body']);
-        return $response;
-    }
-
-    /**
-     * Look up available versions of a given package on packagist.org
-     */
-    public function packagistVersions()
-    {
-        $name = $this->getParam('p', '');
-        $http = new \b8\HttpClient();
-        $http->setHeaders(array('User-Agent: PHPCI/1.0 (+https://www.phptesting.org)'));
-        $res = $http->get('https://packagist.org/packages/'.$name.'.json');
-
-        $response = new b8\Http\Response\JsonResponse();
-        $response->setContent($res['body']);
-        return $response;
-    }
 }
diff --git a/PHPCI/View/Plugin/index.phtml b/PHPCI/View/Plugin/index.phtml
index b595a4df..5c186012 100644
--- a/PHPCI/View/Plugin/index.phtml
+++ b/PHPCI/View/Plugin/index.phtml
@@ -1,45 +1,40 @@
 
-
-    
    
-
 
-
-    
    
-
-
-
-    
    
-
-
-
    
-    
    
-        
    
-    
    
-
-    
-        
-            
-                
-                
-                
-            
-        
-        
-
-            
-                
-                
-                
-            
-
-        
-    
    name; ?>class; ?>source; ?>
    
+
    
+    
    Adding requirements to the PHPCI composer.json file is no longer recommended as a method of installing your required testing tools.
    
+        For this reason, we have removed the ability for PHPCI to modify the composer.json file for you.
+        We recommend that you install testing tools using your project's own composer.json file, by adding them to the "require-dev" section of the file.
    
 
    
 
-
-
 
    
-    
    
+    
    
+        
    
+            
    
+                
    
+            
    
+
+            
+                
+                
+                    
+                    
+                    
+                
+                
+                
+                
+                    
+                        
+                        
+                        
+                    
+                
+                
+            
    name; ?>class; ?>source; ?>
    
+        
    
+    
    
+
+    
    
         
    
             
    
                 
    
@@ -58,44 +53,6 @@
                     
                         
                         
-                        
-                            
-                                
-                            
-                        
-                    
-                
-                
-            
-        
    
-
-    
    
-
-    
    
-        
    
-            
    
-                
    
-            
    
-
-            
-                
-                
-                    
-                    
-                    
-                
-                
-                
-                 $version): ?>
-                    
-                    
-                        
-                        
-                        
@@ -105,108 +62,3 @@
     
 
-
    
-    
    
-        
    
-    
    
-
-    
    
-        
    
-            
-      
-        
-      
-        
    
-
-        
    
-                            
-                                
-                            
-                        
                     
    
                 
                     
 
    
-                
-                
-                    
-                    
-                    
-                
-                
-                
-
-                
-            
    
-        
    
-    
    
-
-
    
-
-
-
-

From 74d313862c8ddda141a9f6a9d09771bec2c6be24 Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Thu, 8 Oct 2015 16:33:01 +0100
Subject: [PATCH 251/329] Adding project groups

---
 PHPCI/Application.php                         |  20 ++-
 PHPCI/Controller/GroupController.php          | 104 +++++++++++
 PHPCI/Controller/HomeController.php           |  43 +++--
 PHPCI/Controller/ProjectController.php        |  16 ++
 .../20151008140800_add_project_groups.php     |  29 +++
 PHPCI/Model/Base/ProjectBase.php              | 112 +++++++++++-
 PHPCI/Model/Base/ProjectGroupBase.php         | 168 ++++++++++++++++++
 PHPCI/Model/ProjectGroup.php                  |  18 ++
 PHPCI/Service/ProjectService.php              |   4 +
 PHPCI/Store/Base/ProjectGroupStoreBase.php    |  46 +++++
 PHPCI/Store/Base/ProjectStoreBase.php         |  49 ++---
 PHPCI/Store/ProjectGroupStore.php             |  18 ++
 PHPCI/View/Group/edit.phtml                   |   9 +
 PHPCI/View/Group/index.phtml                  |  41 +++++
 PHPCI/View/Home/index.phtml                   |  12 +-
 PHPCI/View/Project/view.phtml                 |  10 +-
 PHPCI/View/SummaryTable.phtml                 |   4 +-
 PHPCI/View/layout.phtml                       |  64 ++++---
 18 files changed, 695 insertions(+), 72 deletions(-)
 create mode 100644 PHPCI/Controller/GroupController.php
 create mode 100644 PHPCI/Migrations/20151008140800_add_project_groups.php
 create mode 100644 PHPCI/Model/Base/ProjectGroupBase.php
 create mode 100644 PHPCI/Model/ProjectGroup.php
 create mode 100644 PHPCI/Store/Base/ProjectGroupStoreBase.php
 create mode 100644 PHPCI/Store/ProjectGroupStore.php
 create mode 100644 PHPCI/View/Group/edit.phtml
 create mode 100644 PHPCI/View/Group/index.phtml

diff --git a/PHPCI/Application.php b/PHPCI/Application.php
index 8dcdf76d..f2d40e0d 100644
--- a/PHPCI/Application.php
+++ b/PHPCI/Application.php
@@ -135,15 +135,17 @@ class Application extends b8\Application
      */
     protected function setLayoutVariables(View &$layout)
     {
-        /** @var \PHPCI\Store\ProjectStore $projectStore */
-        $projectStore = b8\Store\Factory::getStore('Project');
-        $layout->projects = $projectStore->getWhere(
-            array('archived' => (int)isset($_GET['archived'])),
-            50,
-            0,
-            array(),
-            array('title' => 'ASC')
-        );
+        $groups = array();
+        $groupList = b8\Store\Factory::getStore('ProjectGroup')->getWhere(array(), 100, 0, array(), array('title' => 'ASC'));
+
+        foreach ($groupList['items'] as $group) {
+            $thisGroup = array('title' => $group->getTitle());
+            $projects = b8\Store\Factory::getStore('Project')->getByGroupId($group->getId());
+            $thisGroup['projects'] = $projects['items'];
+            $groups[] = $thisGroup;
+        }
+
+        $layout->groups = $groups;
     }
 
     /**
diff --git a/PHPCI/Controller/GroupController.php b/PHPCI/Controller/GroupController.php
new file mode 100644
index 00000000..970a240c
--- /dev/null
+++ b/PHPCI/Controller/GroupController.php
@@ -0,0 +1,104 @@
+
+ * @package      PHPCI
+ * @subpackage   Web
+ */
+class GroupController extends Controller
+{
+    /**
+     * @var \PHPCI\Store\ProjectGroupStore
+     */
+    protected $groupStore;
+
+    public function init()
+    {
+        $this->groupStore = b8\Store\Factory::getStore('ProjectGroup');
+    }
+
+    public function index()
+    {
+        $this->requireAdmin();
+
+        $groups = array();
+        $groupList = $this->groupStore->getWhere(array(), 100, 0, array(), array('title' => 'ASC'));
+
+        foreach ($groupList['items'] as $group) {
+            $thisGroup = array(
+                'title' => $group->getTitle(),
+                'id' => $group->getId(),
+            );
+            $projects = b8\Store\Factory::getStore('Project')->getByGroupId($group->getId());
+            $thisGroup['projects'] = $projects['items'];
+            $groups[] = $thisGroup;
+        }
+
+        $this->view->groups = $groups;
+    }
+
+    public function edit($id = null)
+    {
+        $this->requireAdmin();
+
+        if (!is_null($id)) {
+            $group = $this->groupStore->getById($id);
+        } else {
+            $group = new ProjectGroup();
+        }
+
+        if ($this->request->getMethod() == 'POST') {
+            $group->setTitle($this->getParam('title'));
+            $this->groupStore->save($group);
+
+            $response = new b8\Http\Response\RedirectResponse();
+            $response->setHeader('Location', PHPCI_URL.'group');
+            return $response;
+        }
+
+        $form = new Form();
+        $form->setMethod('POST');
+        $form->setAction(PHPCI_URL . 'group/edit' . (!is_null($id) ? '/' . $id : ''));
+
+        $title = new Form\Element\Text('title');
+        $title->setContainerClass('form-group');
+        $title->setClass('form-control');
+        $title->setLabel('Group Title');
+        $title->setValue($group->getTitle());
+
+        $submit = new Form\Element\Submit();
+        $submit->setValue('Save Group');
+
+        $form->addField($title);
+        $form->addField($submit);
+
+        $this->view->form = $form;
+    }
+
+    public function delete($id)
+    {
+        $this->requireAdmin();
+        $group = $this->groupStore->getById($id);
+
+        $this->groupStore->delete($group);
+        $response = new b8\Http\Response\RedirectResponse();
+        $response->setHeader('Location', PHPCI_URL.'group');
+        return $response;
+    }
+}
diff --git a/PHPCI/Controller/HomeController.php b/PHPCI/Controller/HomeController.php
index d0e5a14b..e6c27e14 100644
--- a/PHPCI/Controller/HomeController.php
+++ b/PHPCI/Controller/HomeController.php
@@ -23,15 +23,20 @@ use PHPCI\Model\Build;
 class HomeController extends \PHPCI\Controller
 {
     /**
-     * @var \b8\Store\BuildStore
+     * @var \PHPCI\Store\BuildStore
      */
     protected $buildStore;
 
     /**
-     * @var \b8\Store\ProjectStore
+     * @var \PHPCI\Store\ProjectStore
      */
     protected $projectStore;
 
+    /**
+     * @var \PHPCI\Store\ProjectGroupStore
+     */
+    protected $groupStore;
+
     /**
      * Initialise the controller, set up stores and services.
      */
@@ -39,6 +44,7 @@ class HomeController extends \PHPCI\Controller
     {
         $this->buildStore      = b8\Store\Factory::getStore('Build');
         $this->projectStore    = b8\Store\Factory::getStore('Project');
+        $this->groupStore    = b8\Store\Factory::getStore('ProjectGroup');
     }
 
     /**
@@ -47,15 +53,6 @@ class HomeController extends \PHPCI\Controller
     public function index()
     {
         $this->layout->title = Lang::get('dashboard');
-
-        $projects = $this->projectStore->getWhere(
-            array('archived' => (int)isset($_GET['archived'])),
-            50,
-            0,
-            array(),
-            array('title' => 'ASC')
-        );
-
         $builds = $this->buildStore->getLatestBuilds(null, 10);
 
         foreach ($builds as &$build) {
@@ -63,8 +60,7 @@ class HomeController extends \PHPCI\Controller
         }
 
         $this->view->builds   = $builds;
-        $this->view->projects = $projects['items'];
-        $this->view->summary  = $this->getSummaryHtml($projects);
+        $this->view->groups = $this->getGroupInfo();
 
         return $this->view->render();
     }
@@ -102,7 +98,7 @@ class HomeController extends \PHPCI\Controller
         $failures      = array();
         $counts        = array();
 
-        foreach ($projects['items'] as $project) {
+        foreach ($projects as $project) {
             $summaryBuilds[$project->getId()] = $this->buildStore->getLatestBuilds($project->getId());
 
             $count = $this->buildStore->getWhere(
@@ -122,7 +118,7 @@ class HomeController extends \PHPCI\Controller
         }
 
         $summaryView = new b8\View('SummaryTable');
-        $summaryView->projects   = $projects['items'];
+        $summaryView->projects   = $projects;
         $summaryView->builds     = $summaryBuilds;
         $summaryView->successful = $successes;
         $summaryView->failed     = $failures;
@@ -147,4 +143,21 @@ class HomeController extends \PHPCI\Controller
 
         return $view->render();
     }
+
+    protected function getGroupInfo()
+    {
+        $rtn = array();
+        $groups = $this->groupStore->getWhere(array(), 100, 0, array(), array('title' => 'ASC'));
+
+        foreach ($groups['items'] as $group) {
+            $thisGroup = array('title' => $group->getTitle());
+            $projects = $this->projectStore->getByGroupId($group->getId());
+            $thisGroup['projects'] = $projects['items'];
+            $thisGroup['summary'] = $this->getSummaryHtml($thisGroup['projects']);
+            $rtn[] = $thisGroup;
+        }
+
+        return $rtn;
+    }
+
 }
diff --git a/PHPCI/Controller/ProjectController.php b/PHPCI/Controller/ProjectController.php
index 3a55f49b..be5dee19 100644
--- a/PHPCI/Controller/ProjectController.php
+++ b/PHPCI/Controller/ProjectController.php
@@ -220,6 +220,7 @@ class ProjectController extends PHPCI\Controller
                 'build_config' => $this->getParam('build_config', null),
                 'allow_public_status' => $this->getParam('allow_public_status', 0),
                 'branch' => $this->getParam('branch', null),
+                'group' => $this->getParam('group_id', null),
             );
 
             $project = $this->projectService->createProject($title, $type, $reference, $options);
@@ -284,6 +285,7 @@ class ProjectController extends PHPCI\Controller
             'allow_public_status' => $this->getParam('allow_public_status', 0),
             'archived' => $this->getParam('archived', 0),
             'branch' => $this->getParam('branch', null),
+            'group' => $this->getParam('group_id', null),
         );
 
         $project = $this->projectService->updateProject($project, $title, $type, $reference, $options);
@@ -352,6 +354,20 @@ class ProjectController extends PHPCI\Controller
         $field->setClass('form-control')->setContainerClass('form-group')->setValue('master');
         $form->addField($field);
 
+        $field = Form\Element\Select::create('group_id', 'Project Group', true);
+        $field->setClass('form-control')->setContainerClass('form-group')->setValue(1);
+
+        $groups = array();
+        $groupStore = b8\Store\Factory::getStore('ProjectGroup');
+        $groupList = $groupStore->getWhere(array(), 100, 0, array(), array('title' => 'ASC'));
+
+        foreach ($groupList['items'] as $group) {
+            $groups[$group->getId()] = $group->getTitle();
+        }
+
+        $field->setOptions($groups);
+        $form->addField($field);
+
         $field = Form\Element\Checkbox::create('allow_public_status', Lang::get('allow_public_status'), false);
         $field->setContainerClass('form-group');
         $field->setCheckedValue(1);
diff --git a/PHPCI/Migrations/20151008140800_add_project_groups.php b/PHPCI/Migrations/20151008140800_add_project_groups.php
new file mode 100644
index 00000000..f6035014
--- /dev/null
+++ b/PHPCI/Migrations/20151008140800_add_project_groups.php
@@ -0,0 +1,29 @@
+table('project_group');
+        $table->addColumn('title', 'string', array('limit' => 100, 'null' => false));
+        $table->save();
+
+        $group = new \PHPCI\Model\ProjectGroup();
+        $group->setTitle('Projects');
+
+        /** @var \PHPCI\Model\ProjectGroup $group */
+        $group = \b8\Store\Factory::getStore('ProjectGroup')->save($group);
+
+        $table = $this->table('project');
+        $table->addColumn('group_id', 'integer', array(
+            'signed' => true,
+            'null' => false,
+            'default' => $group->getId(),
+        ));
+
+        $table->addForeignKey('group_id', 'project_group', 'id', array('delete'=> 'RESTRICT', 'update' => 'CASCADE'));
+        $table->save();
+    }
+}
diff --git a/PHPCI/Model/Base/ProjectBase.php b/PHPCI/Model/Base/ProjectBase.php
index 0ea77b78..0dc0c0eb 100644
--- a/PHPCI/Model/Base/ProjectBase.php
+++ b/PHPCI/Model/Base/ProjectBase.php
@@ -45,6 +45,7 @@ class ProjectBase extends Model
         'ssh_public_key' => null,
         'allow_public_status' => null,
         'archived' => null,
+        'group_id' => null,
     );
 
     /**
@@ -64,8 +65,10 @@ class ProjectBase extends Model
         'ssh_public_key' => 'getSshPublicKey',
         'allow_public_status' => 'getAllowPublicStatus',
         'archived' => 'getArchived',
+        'group_id' => 'getGroupId',
 
         // Foreign key getters:
+        'Group' => 'getGroup',
     );
 
     /**
@@ -85,8 +88,10 @@ class ProjectBase extends Model
         'ssh_public_key' => 'setSshPublicKey',
         'allow_public_status' => 'setAllowPublicStatus',
         'archived' => 'setArchived',
+        'group_id' => 'setGroupId',
 
         // Foreign key setters:
+        'Group' => 'setGroup',
     );
 
     /**
@@ -153,10 +158,14 @@ class ProjectBase extends Model
         ),
         'archived' => array(
             'type' => 'tinyint',
-            'length' => 4,
-            'nullable' => true,
+            'length' => 1,
             'default' => null,
         ),
+        'group_id' => array(
+            'type' => 'int',
+            'length' => 11,
+            'default' => 1,
+        ),
     );
 
     /**
@@ -165,12 +174,20 @@ class ProjectBase extends Model
     public $indexes = array(
             'PRIMARY' => array('unique' => true, 'columns' => 'id'),
             'idx_project_title' => array('columns' => 'title'),
+            'group_id' => array('columns' => 'group_id'),
     );
 
     /**
     * @var array
     */
     public $foreignKeys = array(
+            'project_ibfk_1' => array(
+                'local_col' => 'group_id',
+                'update' => 'CASCADE',
+                'delete' => '',
+                'table' => 'project_group',
+                'col' => 'id'
+                ),
     );
 
     /**
@@ -317,6 +334,18 @@ class ProjectBase extends Model
         return $rtn;
     }
 
+    /**
+    * Get the value of GroupId / group_id.
+    *
+    * @return int
+    */
+    public function getGroupId()
+    {
+        $rtn    = $this->data['group_id'];
+
+        return $rtn;
+    }
+
     /**
     * Set the value of Id / id.
     *
@@ -530,10 +559,12 @@ class ProjectBase extends Model
     /**
     * Set the value of Archived / archived.
     *
+    * Must not be null.
     * @param $value int
     */
     public function setArchived($value)
     {
+        $this->_validateNotNull('Archived', $value);
         $this->_validateInt('Archived', $value);
 
         if ($this->data['archived'] === $value) {
@@ -545,6 +576,83 @@ class ProjectBase extends Model
         $this->_setModified('archived');
     }
 
+    /**
+    * Set the value of GroupId / group_id.
+    *
+    * Must not be null.
+    * @param $value int
+    */
+    public function setGroupId($value)
+    {
+        $this->_validateNotNull('GroupId', $value);
+        $this->_validateInt('GroupId', $value);
+
+        if ($this->data['group_id'] === $value) {
+            return;
+        }
+
+        $this->data['group_id'] = $value;
+
+        $this->_setModified('group_id');
+    }
+
+    /**
+     * Get the ProjectGroup model for this Project by Id.
+     *
+     * @uses \PHPCI\Store\ProjectGroupStore::getById()
+     * @uses \PHPCI\Model\ProjectGroup
+     * @return \PHPCI\Model\ProjectGroup
+     */
+    public function getGroup()
+    {
+        $key = $this->getGroupId();
+
+        if (empty($key)) {
+            return null;
+        }
+
+        $cacheKey   = 'Cache.ProjectGroup.' . $key;
+        $rtn        = $this->cache->get($cacheKey, null);
+
+        if (empty($rtn)) {
+            $rtn    = Factory::getStore('ProjectGroup', 'PHPCI')->getById($key);
+            $this->cache->set($cacheKey, $rtn);
+        }
+
+        return $rtn;
+    }
+
+    /**
+    * Set Group - Accepts an ID, an array representing a ProjectGroup or a ProjectGroup model.
+    *
+    * @param $value mixed
+    */
+    public function setGroup($value)
+    {
+        // Is this an instance of ProjectGroup?
+        if ($value instanceof \PHPCI\Model\ProjectGroup) {
+            return $this->setGroupObject($value);
+        }
+
+        // Is this an array representing a ProjectGroup item?
+        if (is_array($value) && !empty($value['id'])) {
+            return $this->setGroupId($value['id']);
+        }
+
+        // Is this a scalar value representing the ID of this foreign key?
+        return $this->setGroupId($value);
+    }
+
+    /**
+    * Set Group - Accepts a ProjectGroup model.
+    * 
+    * @param $value \PHPCI\Model\ProjectGroup
+    */
+    public function setGroupObject(\PHPCI\Model\ProjectGroup $value)
+    {
+        return $this->setGroupId($value->getId());
+    }
+
     /**
      * Get Build models by ProjectId for this Project.
      *
diff --git a/PHPCI/Model/Base/ProjectGroupBase.php b/PHPCI/Model/Base/ProjectGroupBase.php
new file mode 100644
index 00000000..3b5eed69
--- /dev/null
+++ b/PHPCI/Model/Base/ProjectGroupBase.php
@@ -0,0 +1,168 @@
+ null,
+        'title' => null,
+    );
+
+    /**
+    * @var array
+    */
+    protected $getters = array(
+        // Direct property getters:
+        'id' => 'getId',
+        'title' => 'getTitle',
+
+        // Foreign key getters:
+    );
+
+    /**
+    * @var array
+    */
+    protected $setters = array(
+        // Direct property setters:
+        'id' => 'setId',
+        'title' => 'setTitle',
+
+        // Foreign key setters:
+    );
+
+    /**
+    * @var array
+    */
+    public $columns = array(
+        'id' => array(
+            'type' => 'int',
+            'length' => 11,
+            'primary_key' => true,
+            'auto_increment' => true,
+            'default' => null,
+        ),
+        'title' => array(
+            'type' => 'varchar',
+            'length' => 100,
+            'default' => null,
+        ),
+    );
+
+    /**
+    * @var array
+    */
+    public $indexes = array(
+            'PRIMARY' => array('unique' => true, 'columns' => 'id'),
+    );
+
+    /**
+    * @var array
+    */
+    public $foreignKeys = array(
+    );
+
+    /**
+    * Get the value of Id / id.
+    *
+    * @return int
+    */
+    public function getId()
+    {
+        $rtn    = $this->data['id'];
+
+        return $rtn;
+    }
+
+    /**
+    * Get the value of Title / title.
+    *
+    * @return string
+    */
+    public function getTitle()
+    {
+        $rtn    = $this->data['title'];
+
+        return $rtn;
+    }
+
+    /**
+    * Set the value of Id / id.
+    *
+    * Must not be null.
+    * @param $value int
+    */
+    public function setId($value)
+    {
+        $this->_validateNotNull('Id', $value);
+        $this->_validateInt('Id', $value);
+
+        if ($this->data['id'] === $value) {
+            return;
+        }
+
+        $this->data['id'] = $value;
+
+        $this->_setModified('id');
+    }
+
+    /**
+    * Set the value of Title / title.
+    *
+    * Must not be null.
+    * @param $value string
+    */
+    public function setTitle($value)
+    {
+        $this->_validateNotNull('Title', $value);
+        $this->_validateString('Title', $value);
+
+        if ($this->data['title'] === $value) {
+            return;
+        }
+
+        $this->data['title'] = $value;
+
+        $this->_setModified('title');
+    }
+
+    /**
+     * Get Project models by GroupId for this ProjectGroup.
+     *
+     * @uses \PHPCI\Store\ProjectStore::getByGroupId()
+     * @uses \PHPCI\Model\Project
+     * @return \PHPCI\Model\Project[]
+     */
+    public function getGroupProjects()
+    {
+        return Factory::getStore('Project', 'PHPCI')->getByGroupId($this->getId());
+    }
+}
diff --git a/PHPCI/Model/ProjectGroup.php b/PHPCI/Model/ProjectGroup.php
new file mode 100644
index 00000000..f85e6339
--- /dev/null
+++ b/PHPCI/Model/ProjectGroup.php
@@ -0,0 +1,18 @@
+setBranch($options['branch']);
         }
 
+        if (array_key_exists('group', $options)) {
+            $project->setGroup($options['group']);
+        }
+
         // Allow certain project types to set access information:
         $this->processAccessInformation($project);
 
diff --git a/PHPCI/Store/Base/ProjectGroupStoreBase.php b/PHPCI/Store/Base/ProjectGroupStoreBase.php
new file mode 100644
index 00000000..5b2730ea
--- /dev/null
+++ b/PHPCI/Store/Base/ProjectGroupStoreBase.php
@@ -0,0 +1,46 @@
+getById($value, $useConnection);
+    }
+
+    public function getById($value, $useConnection = 'read')
+    {
+        if (is_null($value)) {
+            throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.');
+        }
+
+        $query = 'SELECT * FROM `project_group` WHERE `id` = :id LIMIT 1';
+        $stmt = Database::getConnection($useConnection)->prepare($query);
+        $stmt->bindValue(':id', $value);
+
+        if ($stmt->execute()) {
+            if ($data = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+                return new ProjectGroup($data);
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/PHPCI/Store/Base/ProjectStoreBase.php b/PHPCI/Store/Base/ProjectStoreBase.php
index 562afba2..c764238d 100644
--- a/PHPCI/Store/Base/ProjectStoreBase.php
+++ b/PHPCI/Store/Base/ProjectStoreBase.php
@@ -20,24 +20,11 @@ class ProjectStoreBase extends Store
     protected $modelName   = '\PHPCI\Model\Project';
     protected $primaryKey  = 'id';
 
-    /**
-     * Returns a Project model by primary key.
-     * @param mixed $value
-     * @param string $useConnection
-     * @return \@appNamespace\Model\Project|null
-     */
     public function getByPrimaryKey($value, $useConnection = 'read')
     {
         return $this->getById($value, $useConnection);
     }
 
-    /**
-     * Returns a Project model by Id.
-     * @param mixed $value
-     * @param string $useConnection
-     * @throws HttpException
-     * @return \@appNamespace\Model\Project|null
-     */
     public function getById($value, $useConnection = 'read')
     {
         if (is_null($value)) {
@@ -57,14 +44,6 @@ class ProjectStoreBase extends Store
         return null;
     }
 
-    /**
-     * Returns an array of Project models by Title.
-     * @param mixed $value
-     * @param int $limit
-     * @param string $useConnection
-     * @throws HttpException
-     * @return array
-     */
     public function getByTitle($value, $limit = 1000, $useConnection = 'read')
     {
         if (is_null($value)) {
@@ -92,4 +71,32 @@ class ProjectStoreBase extends Store
             return array('items' => array(), 'count' => 0);
         }
     }
+
+    public function getByGroupId($value, $limit = 1000, $useConnection = 'read')
+    {
+        if (is_null($value)) {
+            throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.');
+        }
+
+
+        $query = 'SELECT * FROM `project` WHERE `group_id` = :group_id LIMIT :limit';
+        $stmt = Database::getConnection($useConnection)->prepare($query);
+        $stmt->bindValue(':group_id', $value);
+        $stmt->bindValue(':limit', (int)$limit, \PDO::PARAM_INT);
+
+        if ($stmt->execute()) {
+            $res = $stmt->fetchAll(\PDO::FETCH_ASSOC);
+
+            $map = function ($item) {
+                return new Project($item);
+            };
+            $rtn = array_map($map, $res);
+
+            $count = count($rtn);
+
+            return array('items' => $rtn, 'count' => $count);
+        } else {
+            return array('items' => array(), 'count' => 0);
+        }
+    }
 }
diff --git a/PHPCI/Store/ProjectGroupStore.php b/PHPCI/Store/ProjectGroupStore.php
new file mode 100644
index 00000000..fa254e3e
--- /dev/null
+++ b/PHPCI/Store/ProjectGroupStore.php
@@ -0,0 +1,18 @@
+
+    
    
+        
    Add / Edit Group
    
+    
    
+
+    
    
+        
+    
    
+
    
\ No newline at end of file
diff --git a/PHPCI/View/Group/index.phtml b/PHPCI/View/Group/index.phtml
new file mode 100644
index 00000000..e07c9af1
--- /dev/null
+++ b/PHPCI/View/Group/index.phtml
@@ -0,0 +1,41 @@
+
    
+    
+        Add Group
+    
+
    
+
+
+
    
+    
    
+        
    Project Groups
    
+    
    
+
+    
+        
+        
+            
+            
+            
+        
+        
+        
+            
+            
+                
+                
+                
+            
+            
+        
+    
    TitleProjects
    
+                    
+                        Edit
+                    
+
+                    
+                    
+                        Delete
+                    
+                    
+                
    
+
    
\ No newline at end of file
diff --git a/PHPCI/View/Home/index.phtml b/PHPCI/View/Home/index.phtml
index 251bb9ee..6bce4be8 100644
--- a/PHPCI/View/Home/index.phtml
+++ b/PHPCI/View/Home/index.phtml
@@ -2,7 +2,17 @@
 
    
 
     
    
-        
+        
+        
    
+            
    
+                
    
+            
    
+
+            
    
+                
+            
    
+        
    
+        
     
    
 
     
    
diff --git a/PHPCI/View/Project/view.phtml b/PHPCI/View/Project/view.phtml
index ee21abe9..e66daa27 100644
--- a/PHPCI/View/Project/view.phtml
+++ b/PHPCI/View/Project/view.phtml
@@ -5,8 +5,16 @@
 
 
 
    
+    
+        
+    
+
+    
+        
+    
+
     
    
-        
+        
             
         
 
diff --git a/PHPCI/View/SummaryTable.phtml b/PHPCI/View/SummaryTable.phtml
index 9ddaabb0..5e2192b4 100644
--- a/PHPCI/View/SummaryTable.phtml
+++ b/PHPCI/View/SummaryTable.phtml
@@ -83,7 +83,7 @@ foreach($projects as $project):
 ?>
 
  10) {
+    if (count($projects) > 5) {
         $containerClass = 'small-box-minimal';
     } else {
         $containerClass = 'small-box-full';
@@ -92,7 +92,7 @@ foreach($projects as $project):
 
     
    
 
-     10): ?>
+     5): ?>
 
         
    
             
    
diff --git a/PHPCI/View/layout.phtml b/PHPCI/View/layout.phtml
index 82eabfe5..cbd98161 100644
--- a/PHPCI/View/layout.phtml
+++ b/PHPCI/View/layout.phtml
@@ -159,6 +159,12 @@
                                 
                             
 
+                            
  • 
+                                
+                                     Project Groups
+                                
+                            
    • 
+
                             
  • 
                                 
                                      
@@ -180,41 +186,57 @@
                     
    • 
                 
 
-                
+                
                 
  • 
                     
-                        
-                        getTitle(); ?>
+                        
+                        
                         
                     
 
+                    
                     
+                            */ ?>
                         
    • 
-                        
+                        
                     
+                    
+
                 
                 
 

From 31165a6bfaefff05fa591851ff458d082e3c4c39 Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Thu, 8 Oct 2015 16:52:19 +0100
Subject: [PATCH 252/329] General model / store cleanup

---
 PHPCI/Model/Base/BuildBase.php          |  2 +-
 PHPCI/Model/Base/BuildMetaBase.php      |  2 +-
 PHPCI/Model/Base/UserBase.php           |  2 ++
 PHPCI/Store/Base/BuildMetaStoreBase.php | 29 --------------------
 PHPCI/Store/Base/BuildStoreBase.php     | 29 --------------------
 PHPCI/Store/Base/UserStoreBase.php      | 35 +++----------------------
 6 files changed, 8 insertions(+), 91 deletions(-)

diff --git a/PHPCI/Model/Base/BuildBase.php b/PHPCI/Model/Base/BuildBase.php
index 119290e2..728efc37 100644
--- a/PHPCI/Model/Base/BuildBase.php
+++ b/PHPCI/Model/Base/BuildBase.php
@@ -118,7 +118,7 @@ class BuildBase extends Model
             'default' => null,
         ),
         'log' => array(
-            'type' => 'text',
+            'type' => 'mediumtext',
             'nullable' => true,
             'default' => null,
         ),
diff --git a/PHPCI/Model/Base/BuildMetaBase.php b/PHPCI/Model/Base/BuildMetaBase.php
index 0ac8fa93..dc018819 100644
--- a/PHPCI/Model/Base/BuildMetaBase.php
+++ b/PHPCI/Model/Base/BuildMetaBase.php
@@ -99,7 +99,7 @@ class BuildMetaBase extends Model
             'default' => null,
         ),
         'meta_value' => array(
-            'type' => 'text',
+            'type' => 'mediumtext',
             'default' => null,
         ),
     );
diff --git a/PHPCI/Model/Base/UserBase.php b/PHPCI/Model/Base/UserBase.php
index e9be15a0..fe71baf8 100644
--- a/PHPCI/Model/Base/UserBase.php
+++ b/PHPCI/Model/Base/UserBase.php
@@ -106,6 +106,8 @@ class UserBase extends Model
     public $indexes = array(
             'PRIMARY' => array('unique' => true, 'columns' => 'id'),
             'idx_email' => array('unique' => true, 'columns' => 'email'),
+            'email' => array('unique' => true, 'columns' => 'email'),
+            'name' => array('unique' => true, 'columns' => 'name'),
     );
 
     /**
diff --git a/PHPCI/Store/Base/BuildMetaStoreBase.php b/PHPCI/Store/Base/BuildMetaStoreBase.php
index 7a3d4159..6c4cfc15 100644
--- a/PHPCI/Store/Base/BuildMetaStoreBase.php
+++ b/PHPCI/Store/Base/BuildMetaStoreBase.php
@@ -20,24 +20,11 @@ class BuildMetaStoreBase extends Store
     protected $modelName   = '\PHPCI\Model\BuildMeta';
     protected $primaryKey  = 'id';
 
-    /**
-     * Returns a BuildMeta model by primary key.
-     * @param mixed $value
-     * @param string $useConnection
-     * @return \@appNamespace\Model\BuildMeta|null
-     */
     public function getByPrimaryKey($value, $useConnection = 'read')
     {
         return $this->getById($value, $useConnection);
     }
 
-    /**
-     * Returns a BuildMeta model by Id.
-     * @param mixed $value
-     * @param string $useConnection
-     * @throws HttpException
-     * @return \@appNamespace\Model\BuildMeta|null
-     */
     public function getById($value, $useConnection = 'read')
     {
         if (is_null($value)) {
@@ -57,14 +44,6 @@ class BuildMetaStoreBase extends Store
         return null;
     }
 
-    /**
-     * Returns an array of BuildMeta models by ProjectId.
-     * @param mixed $value
-     * @param int $limit
-     * @param string $useConnection
-     * @throws HttpException
-     * @return array
-     */
     public function getByProjectId($value, $limit = 1000, $useConnection = 'read')
     {
         if (is_null($value)) {
@@ -93,14 +72,6 @@ class BuildMetaStoreBase extends Store
         }
     }
 
-    /**
-     * Returns an array of BuildMeta models by BuildId.
-     * @param mixed $value
-     * @param int $limit
-     * @param string $useConnection
-     * @throws HttpException
-     * @return array
-     */
     public function getByBuildId($value, $limit = 1000, $useConnection = 'read')
     {
         if (is_null($value)) {
diff --git a/PHPCI/Store/Base/BuildStoreBase.php b/PHPCI/Store/Base/BuildStoreBase.php
index 0560d72b..89d3a82f 100644
--- a/PHPCI/Store/Base/BuildStoreBase.php
+++ b/PHPCI/Store/Base/BuildStoreBase.php
@@ -20,24 +20,11 @@ class BuildStoreBase extends Store
     protected $modelName   = '\PHPCI\Model\Build';
     protected $primaryKey  = 'id';
 
-    /**
-     * Returns a Build model by primary key.
-     * @param mixed $value
-     * @param string $useConnection
-     * @return \@appNamespace\Model\Build|null
-     */
     public function getByPrimaryKey($value, $useConnection = 'read')
     {
         return $this->getById($value, $useConnection);
     }
 
-    /**
-     * Returns a Build model by Id.
-     * @param mixed $value
-     * @param string $useConnection
-     * @throws HttpException
-     * @return \@appNamespace\Model\Build|null
-     */
     public function getById($value, $useConnection = 'read')
     {
         if (is_null($value)) {
@@ -57,14 +44,6 @@ class BuildStoreBase extends Store
         return null;
     }
 
-    /**
-     * Returns an array of Build models by ProjectId.
-     * @param mixed $value
-     * @param int $limit
-     * @param string $useConnection
-     * @throws HttpException
-     * @return array
-     */
     public function getByProjectId($value, $limit = 1000, $useConnection = 'read')
     {
         if (is_null($value)) {
@@ -93,14 +72,6 @@ class BuildStoreBase extends Store
         }
     }
 
-    /**
-     * Returns an array of Build models by Status.
-     * @param mixed $value
-     * @param int $limit
-     * @param string $useConnection
-     * @throws HttpException
-     * @return array
-     */
     public function getByStatus($value, $limit = 1000, $useConnection = 'read')
     {
         if (is_null($value)) {
diff --git a/PHPCI/Store/Base/UserStoreBase.php b/PHPCI/Store/Base/UserStoreBase.php
index f2893ac5..90d60cb4 100644
--- a/PHPCI/Store/Base/UserStoreBase.php
+++ b/PHPCI/Store/Base/UserStoreBase.php
@@ -20,24 +20,11 @@ class UserStoreBase extends Store
     protected $modelName   = '\PHPCI\Model\User';
     protected $primaryKey  = 'id';
 
-    /**
-     * Returns a User model by primary key.
-     * @param mixed $value
-     * @param string $useConnection
-     * @return \@appNamespace\Model\User|null
-     */
     public function getByPrimaryKey($value, $useConnection = 'read')
     {
         return $this->getById($value, $useConnection);
     }
 
-    /**
-     * Returns a User model by Id.
-     * @param mixed $value
-     * @param string $useConnection
-     * @throws HttpException
-     * @return \@appNamespace\Model\User|null
-     */
     public function getById($value, $useConnection = 'read')
     {
         if (is_null($value)) {
@@ -57,13 +44,6 @@ class UserStoreBase extends Store
         return null;
     }
 
-    /**
-     * Returns a User model by Email.
-     * @param string $value
-     * @param string $useConnection
-     * @throws HttpException
-     * @return \@appNamespace\Model\User|null
-     */
     public function getByEmail($value, $useConnection = 'read')
     {
         if (is_null($value)) {
@@ -82,23 +62,16 @@ class UserStoreBase extends Store
 
         return null;
     }
-    
-    /**
-     * Returns a User model by Email.
-     * @param string $value
-     * @param string $useConnection
-     * @throws HttpException
-     * @return \@appNamespace\Model\User|null
-     */
-    public function getByLoginOrEmail($value, $useConnection = 'read')
+
+    public function getByName($value, $useConnection = 'read')
     {
         if (is_null($value)) {
             throw new HttpException('Value passed to ' . __FUNCTION__ . ' cannot be null.');
         }
 
-        $query = 'SELECT * FROM `user` WHERE `name` = :value OR `email` = :value LIMIT 1';
+        $query = 'SELECT * FROM `user` WHERE `name` = :name LIMIT 1';
         $stmt = Database::getConnection($useConnection)->prepare($query);
-        $stmt->bindValue(':value', $value);
+        $stmt->bindValue(':name', $value);
 
         if ($stmt->execute()) {
             if ($data = $stmt->fetch(\PDO::FETCH_ASSOC)) {

From 7ad1d317cdb368e460fc0e95e9f9dc8798ddf3fe Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Thu, 8 Oct 2015 16:52:44 +0100
Subject: [PATCH 253/329] Updating builds to try database config first, and
 fall back to file config.

---
 PHPCI/Model/Build.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/PHPCI/Model/Build.php b/PHPCI/Model/Build.php
index f8d2e378..be7f4a8a 100644
--- a/PHPCI/Model/Build.php
+++ b/PHPCI/Model/Build.php
@@ -99,6 +99,11 @@ class Build extends BuildBase
     {
         $build_config = null;
 
+        // Try getting the project build config from the database:
+        if (empty($build_config)) {
+            $build_config = $this->getProject()->getBuildConfig();
+        }
+
         // Try .phpci.yml
         if (is_file($buildPath . '/.phpci.yml')) {
             $build_config = file_get_contents($buildPath . '/.phpci.yml');
@@ -109,11 +114,6 @@ class Build extends BuildBase
             $build_config = file_get_contents($buildPath . '/phpci.yml');
         }
 
-        // Try getting the project build config from the database:
-        if (empty($build_config)) {
-            $build_config = $this->getProject()->getBuildConfig();
-        }
-
         // Fall back to zero config plugins:
         if (empty($build_config)) {
             $build_config = $this->getZeroConfigPlugins($builder);

From a7473eb2508dadd36bed8b13e1ce7be4d839aad3 Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Thu, 8 Oct 2015 16:53:39 +0100
Subject: [PATCH 254/329] Updating deps.

---
 composer.lock | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/composer.lock b/composer.lock
index 34626b27..0fc6a092 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1097,16 +1097,16 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "2.2.3",
+            "version": "2.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "ef1ca6835468857944d5c3b48fa503d5554cff2f"
+                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ef1ca6835468857944d5c3b48fa503d5554cff2f",
-                "reference": "ef1ca6835468857944d5c3b48fa503d5554cff2f",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979",
+                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979",
                 "shasum": ""
             },
             "require": {
@@ -1155,7 +1155,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2015-09-14 06:51:16"
+            "time": "2015-10-06 15:47:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -1337,16 +1337,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "4.8.10",
+            "version": "4.8.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "463163747474815c5ccd4ae12b5b355ec12158e8"
+                "reference": "bdd199472410fd7e32751f9c814c7e06f2c21bd5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/463163747474815c5ccd4ae12b5b355ec12158e8",
-                "reference": "463163747474815c5ccd4ae12b5b355ec12158e8",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bdd199472410fd7e32751f9c814c7e06f2c21bd5",
+                "reference": "bdd199472410fd7e32751f9c814c7e06f2c21bd5",
                 "shasum": ""
             },
             "require": {
@@ -1405,7 +1405,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2015-10-01 09:14:30"
+            "time": "2015-10-07 10:39:46"
         },
         {
             "name": "phpunit/phpunit-mock-objects",

From e871df80c26b9e211845db0c97085b2b151dbd42 Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Thu, 8 Oct 2015 16:54:01 +0100
Subject: [PATCH 255/329] Adding the ability to run branch-specific stages

---
 PHPCI/Plugin/Util/Executor.php | 53 +++++++++++++++++++++++++++++++---
 1 file changed, 49 insertions(+), 4 deletions(-)

diff --git a/PHPCI/Plugin/Util/Executor.php b/PHPCI/Plugin/Util/Executor.php
index 3ca244af..b085ac87 100644
--- a/PHPCI/Plugin/Util/Executor.php
+++ b/PHPCI/Plugin/Util/Executor.php
@@ -50,12 +50,57 @@ class Executor
     public function executePlugins(&$config, $stage)
     {
         $success = true;
-        // Ignore any stages for which we don't have plugins set:
-        if (!array_key_exists($stage, $config) || !is_array($config[$stage])) {
-            return $success;
+
+        /** @var \PHPCI\Model\Build $build */
+        $build = $this->pluginFactory->getResourceFor('PHPCI\Model\Build');
+        $branch = $build->getBranch();
+        $pluginsToExecute = array();
+
+        // If we have global plugins to execute for this stage, add them to the list to be executed:
+        if (array_key_exists($stage, $config) && is_array($config[$stage])) {
+            $pluginsToExecute[] = $config[$stage];
         }
 
-        foreach ($config[$stage] as $plugin => $options) {
+        // If we have branch-specific plugins to execute, add them to the list to be executed:
+        if (isset($config['branch-' . $branch][$stage]) && is_array($config['branch-' . $branch][$stage])) {
+            $branchConfig = $config['branch-' . $branch];
+            $runOption = isset($branchConfig['run-option']) ? $branchConfig['run-option'] : 'after';
+            $plugins = $config['branch-' . $branch][$stage];
+
+            switch ($runOption) {
+                case 'replace':
+                    $pluginsToExecute = array();
+                    $pluginsToExecute[] = $plugins;
+                    break;
+
+                case 'before':
+                    array_unshift($pluginsToExecute, $plugins);
+                    break;
+
+                case 'after':
+                    array_push($pluginsToExecute, $plugins);
+                    break;
+
+                default:
+                    array_push($pluginsToExecute, $plugins);
+                    break;
+            }
+        }
+
+        foreach ($pluginsToExecute as $pluginSet) {
+            if (!$this->doExecutePlugins($pluginSet, $stage)) {
+                $success = false;
+            }
+        }
+
+        return $success;
+    }
+
+    protected function doExecutePlugins(&$plugins, $stage)
+    {
+        $success = true;
+
+        foreach ($plugins as $plugin => $options) {
             $this->logger->log(Lang::get('running_plugin', $plugin));
 
             $this->setPluginStatus($stage, $plugin, Build::STATUS_RUNNING);

From 4e0325e8876aa93070678887ada5900bb62e7196 Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Thu, 8 Oct 2015 17:30:34 +0100
Subject: [PATCH 256/329] Missing build bugfix.

---
 PHPCI/Worker/BuildWorker.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/PHPCI/Worker/BuildWorker.php b/PHPCI/Worker/BuildWorker.php
index e08fdd84..a6fcc536 100644
--- a/PHPCI/Worker/BuildWorker.php
+++ b/PHPCI/Worker/BuildWorker.php
@@ -124,9 +124,9 @@ class BuildWorker
                 Database::reset($config);
             }
 
-            $build = BuildFactory::getBuildById($jobData['build_id']);
-
-            if (empty($build)) {
+            try {
+                $build = BuildFactory::getBuildById($jobData['build_id']);
+            } catch (\Exception $ex) {
                 $this->logger->addWarning('Build #' . $jobData['build_id'] . ' does not exist in the database.');
                 $pheanstalk->delete($job);
             }

From ada9e332044fd1cbb2c14fdeffc4ce58e80b60c5 Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Thu, 8 Oct 2015 20:15:20 +0100
Subject: [PATCH 257/329] Restoring to login by email.

---
 PHPCI/Controller/SessionController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/PHPCI/Controller/SessionController.php b/PHPCI/Controller/SessionController.php
index 2995c514..b68d61f7 100644
--- a/PHPCI/Controller/SessionController.php
+++ b/PHPCI/Controller/SessionController.php
@@ -49,7 +49,7 @@ class SessionController extends \PHPCI\Controller
             } else {
                 unset($_SESSION['login_token']);
 
-                $user = $this->userStore->getByLoginOrEmail($this->getParam('email'));
+                $user = $this->userStore->getByEmail($this->getParam('email'));
 
                 if ($user && password_verify($this->getParam('password', ''), $user->getHash())) {
                     session_regenerate_id(true);
@@ -68,7 +68,7 @@ class SessionController extends \PHPCI\Controller
         $form->setAction(PHPCI_URL.'session/login');
 
         $email = new b8\Form\Element\Email('email');
-        $email->setLabel(Lang::get('login'));
+        $email->setLabel(Lang::get('email_address'));
         $email->setRequired(true);
         $email->setContainerClass('form-group');
         $email->setClass('form-control');

From 370eebd227d90dd16a07d3091ff69c2c5722b775 Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Thu, 8 Oct 2015 20:20:42 +0100
Subject: [PATCH 258/329] Fixing PHPCS error in HomeController

---
 PHPCI/Controller/HomeController.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/PHPCI/Controller/HomeController.php b/PHPCI/Controller/HomeController.php
index e6c27e14..1b0c60aa 100644
--- a/PHPCI/Controller/HomeController.php
+++ b/PHPCI/Controller/HomeController.php
@@ -159,5 +159,4 @@ class HomeController extends \PHPCI\Controller
 
         return $rtn;
     }
-
 }

From 2f859be369338aa2612699a1ddfc994efbd7168a Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Thu, 8 Oct 2015 20:22:43 +0100
Subject: [PATCH 259/329] PHPCS Fix

---
 PHPCI/Application.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/PHPCI/Application.php b/PHPCI/Application.php
index f2d40e0d..a6eb646c 100644
--- a/PHPCI/Application.php
+++ b/PHPCI/Application.php
@@ -136,7 +136,8 @@ class Application extends b8\Application
     protected function setLayoutVariables(View &$layout)
     {
         $groups = array();
-        $groupList = b8\Store\Factory::getStore('ProjectGroup')->getWhere(array(), 100, 0, array(), array('title' => 'ASC'));
+        $groupStore = b8\Store\Factory::getStore('ProjectGroup');
+        $groupList = $groupStore->getWhere(array(), 100, 0, array(), array('title' => 'ASC'));
 
         foreach ($groupList['items'] as $group) {
             $thisGroup = array('title' => $group->getTitle());

From af90b94a3cbe2a7c78b062b4b123c02287a52e0c Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Thu, 8 Oct 2015 20:24:32 +0100
Subject: [PATCH 260/329] PHPMD Fixes

---
 PHPCI/Controller/GroupController.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/PHPCI/Controller/GroupController.php b/PHPCI/Controller/GroupController.php
index 970a240c..c19b0923 100644
--- a/PHPCI/Controller/GroupController.php
+++ b/PHPCI/Controller/GroupController.php
@@ -53,11 +53,11 @@ class GroupController extends Controller
         $this->view->groups = $groups;
     }
 
-    public function edit($id = null)
+    public function edit($groupId = null)
     {
         $this->requireAdmin();
 
-        if (!is_null($id)) {
+        if (!is_null($groupId)) {
             $group = $this->groupStore->getById($id);
         } else {
             $group = new ProjectGroup();
@@ -74,7 +74,7 @@ class GroupController extends Controller
 
         $form = new Form();
         $form->setMethod('POST');
-        $form->setAction(PHPCI_URL . 'group/edit' . (!is_null($id) ? '/' . $id : ''));
+        $form->setAction(PHPCI_URL . 'group/edit' . (!is_null($groupId) ? '/' . $groupId : ''));
 
         $title = new Form\Element\Text('title');
         $title->setContainerClass('form-group');
@@ -91,10 +91,10 @@ class GroupController extends Controller
         $this->view->form = $form;
     }
 
-    public function delete($id)
+    public function delete($groupId)
     {
         $this->requireAdmin();
-        $group = $this->groupStore->getById($id);
+        $group = $this->groupStore->getById($groupId);
 
         $this->groupStore->delete($group);
         $response = new b8\Http\Response\RedirectResponse();

From 4375c524a9baf781392330dd86d2bc7d5f33d8bc Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Thu, 8 Oct 2015 20:27:40 +0100
Subject: [PATCH 261/329] PHPMD Fix

---
 PHPCI/Controller/GroupController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PHPCI/Controller/GroupController.php b/PHPCI/Controller/GroupController.php
index c19b0923..cc4b4c51 100644
--- a/PHPCI/Controller/GroupController.php
+++ b/PHPCI/Controller/GroupController.php
@@ -58,7 +58,7 @@ class GroupController extends Controller
         $this->requireAdmin();
 
         if (!is_null($groupId)) {
-            $group = $this->groupStore->getById($id);
+            $group = $this->groupStore->getById($groupId);
         } else {
             $group = new ProjectGroup();
         }

From 68249d2f5dbb803223e365985a7abe476053e3e5 Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Fri, 9 Oct 2015 09:16:05 +0100
Subject: [PATCH 262/329] Cleanup of new executor changes.

---
 PHPCI/Plugin/Util/Executor.php | 90 +++++++++++++++++++++++-----------
 1 file changed, 61 insertions(+), 29 deletions(-)

diff --git a/PHPCI/Plugin/Util/Executor.php b/PHPCI/Plugin/Util/Executor.php
index b085ac87..bdd06b7e 100644
--- a/PHPCI/Plugin/Util/Executor.php
+++ b/PHPCI/Plugin/Util/Executor.php
@@ -50,10 +50,6 @@ class Executor
     public function executePlugins(&$config, $stage)
     {
         $success = true;
-
-        /** @var \PHPCI\Model\Build $build */
-        $build = $this->pluginFactory->getResourceFor('PHPCI\Model\Build');
-        $branch = $build->getBranch();
         $pluginsToExecute = array();
 
         // If we have global plugins to execute for this stage, add them to the list to be executed:
@@ -61,31 +57,7 @@ class Executor
             $pluginsToExecute[] = $config[$stage];
         }
 
-        // If we have branch-specific plugins to execute, add them to the list to be executed:
-        if (isset($config['branch-' . $branch][$stage]) && is_array($config['branch-' . $branch][$stage])) {
-            $branchConfig = $config['branch-' . $branch];
-            $runOption = isset($branchConfig['run-option']) ? $branchConfig['run-option'] : 'after';
-            $plugins = $config['branch-' . $branch][$stage];
-
-            switch ($runOption) {
-                case 'replace':
-                    $pluginsToExecute = array();
-                    $pluginsToExecute[] = $plugins;
-                    break;
-
-                case 'before':
-                    array_unshift($pluginsToExecute, $plugins);
-                    break;
-
-                case 'after':
-                    array_push($pluginsToExecute, $plugins);
-                    break;
-
-                default:
-                    array_push($pluginsToExecute, $plugins);
-                    break;
-            }
-        }
+        $pluginsToExecute = $this->getBranchSpecificPlugins($config, $stage, $pluginsToExecute);
 
         foreach ($pluginsToExecute as $pluginSet) {
             if (!$this->doExecutePlugins($pluginSet, $stage)) {
@@ -96,6 +68,66 @@ class Executor
         return $success;
     }
 
+    /**
+     * Check the config for any plugins specific to the branch we're currently building.
+     * @param $config
+     * @param $stage
+     * @param $pluginsToExecute
+     * @return array
+     */
+    protected function getBranchSpecificPlugins(&$config, $stage, $pluginsToExecute)
+    {
+        /** @var \PHPCI\Model\Build $build */
+        $build = $this->pluginFactory->getResourceFor('PHPCI\Model\Build');
+        $branch = $build->getBranch();
+
+        // If we don't have any branch-specific plugins:
+        if (!isset($config['branch-' . $branch][$stage]) || !is_array($config['branch-' . $branch][$stage])) {
+            return $pluginsToExecute;
+        }
+
+        // If we have branch-specific plugins to execute, add them to the list to be executed:
+        $branchConfig = $config['branch-' . $branch];
+        $plugins = $branchConfig[$stage];
+
+        $runOption = 'after';
+
+        if (!empty($branchConfig['run-option'])) {
+            $runOption = $branchConfig['run-option'];
+        }
+
+        switch ($runOption) {
+            // Replace standard plugin set for this stage with just the branch-specific ones:
+            case 'replace':
+                $pluginsToExecute = array();
+                $pluginsToExecute[] = $plugins;
+                break;
+
+            // Run branch-specific plugins before standard plugins:
+            case 'before':
+                array_unshift($pluginsToExecute, $plugins);
+                break;
+
+            // Run branch-specific plugins after standard plugins:
+            case 'after':
+                array_push($pluginsToExecute, $plugins);
+                break;
+
+            default:
+                array_push($pluginsToExecute, $plugins);
+                break;
+        }
+
+        return $pluginsToExecute;
+    }
+
+    /**
+     * Execute the list of plugins found for a given testing stage.
+     * @param $plugins
+     * @param $stage
+     * @return bool
+     * @throws \Exception
+     */
     protected function doExecutePlugins(&$plugins, $stage)
     {
         $success = true;

From a0083580561acff7082df37f2222d54e2492c8cd Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Fri, 9 Oct 2015 09:27:45 +0100
Subject: [PATCH 263/329] Cleaning up BuildWorker #1

---
 PHPCI/Worker/BuildWorker.php | 71 ++++++++++++++++++++++++------------
 1 file changed, 47 insertions(+), 24 deletions(-)

diff --git a/PHPCI/Worker/BuildWorker.php b/PHPCI/Worker/BuildWorker.php
index a6fcc536..37d2bc20 100644
--- a/PHPCI/Worker/BuildWorker.php
+++ b/PHPCI/Worker/BuildWorker.php
@@ -6,6 +6,7 @@ use b8\Config;
 use b8\Database;
 use b8\Store\Factory;
 use Monolog\Logger;
+use Pheanstalk\Job;
 use Pheanstalk\Pheanstalk;
 use PHPCI\Builder;
 use PHPCI\BuildFactory;
@@ -49,6 +50,16 @@ class BuildWorker
      */
     protected $queue;
 
+    /**
+     * @var \Pheanstalk\Pheanstalk
+     */
+    protected $pheanstalk;
+
+    /**
+     * @var int
+     */
+    protected $totalJobs = 0;
+
     /**
      * @param $host
      * @param $queue
@@ -57,6 +68,7 @@ class BuildWorker
     {
         $this->host = $host;
         $this->queue = $queue;
+        $this->pheanstalk = new Pheanstalk($this->host);
     }
 
     /**
@@ -80,36 +92,20 @@ class BuildWorker
      */
     public function startWorker()
     {
-        $pheanstalk = new Pheanstalk($this->host);
-        $pheanstalk->watch($this->queue);
-        $pheanstalk->ignore('default');
+        $this->pheanstalk->watch($this->queue);
+        $this->pheanstalk->ignore('default');
         $buildStore = Factory::getStore('Build');
 
-        $jobs = 0;
-
         while ($this->run) {
             // Get a job from the queue:
-            $job = $pheanstalk->reserve();
+            $job = $this->pheanstalk->reserve();
 
-            // Make sure we don't run more than maxJobs jobs on this worker:
-            $jobs++;
-
-            if ($this->maxJobs != -1 && $this->maxJobs <= $jobs) {
-                $this->run = false;
-            }
+            $this->checkJobLimit();
 
             // Get the job data and run the job:
             $jobData = json_decode($job->getData(), true);
 
-            if (empty($jobData) || !is_array($jobData)) {
-                // Probably not from PHPCI.
-                $pheanstalk->release($job);
-                continue;
-            }
-
-            if (!array_key_exists('type', $jobData) || $jobData['type'] !== 'phpci.build') {
-                // Probably not from PHPCI.
-                $pheanstalk->delete($job);
+            if (!$this->verifyJob($job, $jobData)) {
                 continue;
             }
 
@@ -128,7 +124,7 @@ class BuildWorker
                 $build = BuildFactory::getBuildById($jobData['build_id']);
             } catch (\Exception $ex) {
                 $this->logger->addWarning('Build #' . $jobData['build_id'] . ' does not exist in the database.');
-                $pheanstalk->delete($job);
+                $this->pheanstalk->delete($job);
             }
 
             try {
@@ -147,7 +143,7 @@ class BuildWorker
                 // If we've caught a PDO Exception, it is probably not the fault of the build, but of a failed
                 // connection or similar. Release the job and kill the worker.
                 $this->run = false;
-                $pheanstalk->release($job);
+                $this->pheanstalk->release($job);
             } catch (\Exception $ex) {
                 $build->setStatus(Build::STATUS_FAILED);
                 $build->setFinished(new \DateTime());
@@ -163,7 +159,7 @@ class BuildWorker
             }
 
             // Delete the job when we're done:
-            $pheanstalk->delete($job);
+            $this->pheanstalk->delete($job);
         }
     }
 
@@ -174,4 +170,31 @@ class BuildWorker
     {
         $this->run = false;
     }
+
+    protected function checkJobLimit()
+    {
+        // Make sure we don't run more than maxJobs jobs on this worker:
+        $this->totalJobs++;
+
+        if ($this->maxJobs != -1 && $this->maxJobs <= $this->totalJobs) {
+            $this->stopWorker();
+        }
+    }
+
+    protected function verifyJob(Job $job, $jobData)
+    {
+        if (empty($jobData) || !is_array($jobData)) {
+            // Probably not from PHPCI.
+            $this->pheanstalk->release($job);
+            return false;
+        }
+
+        if (!array_key_exists('type', $jobData) || $jobData['type'] !== 'phpci.build') {
+            // Probably not from PHPCI.
+            $this->pheanstalk->delete($job);
+            return false;
+        }
+
+        return true;
+    }
 }

From e61ce203a34cebaa83f946f61e454bcd3b9661be Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Fri, 9 Oct 2015 09:38:55 +0100
Subject: [PATCH 264/329] Docblocks

---
 PHPCI/Controller/GroupController.php       | 16 ++++++++++++++++
 PHPCI/Controller/HomeController.php        |  4 ++++
 PHPCI/Store/Base/BuildMetaStoreBase.php    | 15 +++++++++++++++
 PHPCI/Store/Base/BuildStoreBase.php        | 15 +++++++++++++++
 PHPCI/Store/Base/ProjectGroupStoreBase.php |  7 +++++++
 PHPCI/Store/Base/ProjectStoreBase.php      | 15 +++++++++++++++
 PHPCI/Store/Base/UserStoreBase.php         | 15 +++++++++++++++
 PHPCI/Worker/BuildWorker.php               | 12 +++++++++++-
 8 files changed, 98 insertions(+), 1 deletion(-)

diff --git a/PHPCI/Controller/GroupController.php b/PHPCI/Controller/GroupController.php
index cc4b4c51..898f9e41 100644
--- a/PHPCI/Controller/GroupController.php
+++ b/PHPCI/Controller/GroupController.php
@@ -28,11 +28,17 @@ class GroupController extends Controller
      */
     protected $groupStore;
 
+    /**
+     * Set up this controller.
+     */
     public function init()
     {
         $this->groupStore = b8\Store\Factory::getStore('ProjectGroup');
     }
 
+    /**
+     * List project groups.
+     */
     public function index()
     {
         $this->requireAdmin();
@@ -53,6 +59,11 @@ class GroupController extends Controller
         $this->view->groups = $groups;
     }
 
+    /**
+     * Add or edit a project group.
+     * @param null $groupId
+     * @return void|b8\Http\Response\RedirectResponse
+     */
     public function edit($groupId = null)
     {
         $this->requireAdmin();
@@ -91,6 +102,11 @@ class GroupController extends Controller
         $this->view->form = $form;
     }
 
+    /**
+     * Delete a project group.
+     * @param $groupId
+     * @return b8\Http\Response\RedirectResponse
+     */
     public function delete($groupId)
     {
         $this->requireAdmin();
diff --git a/PHPCI/Controller/HomeController.php b/PHPCI/Controller/HomeController.php
index 1b0c60aa..4241d324 100644
--- a/PHPCI/Controller/HomeController.php
+++ b/PHPCI/Controller/HomeController.php
@@ -144,6 +144,10 @@ class HomeController extends \PHPCI\Controller
         return $view->render();
     }
 
+    /**
+     * Get a summary of the project groups we have, and what projects they have in them.
+     * @return array
+     */
     protected function getGroupInfo()
     {
         $rtn = array();
diff --git a/PHPCI/Store/Base/BuildMetaStoreBase.php b/PHPCI/Store/Base/BuildMetaStoreBase.php
index 6c4cfc15..52665d79 100644
--- a/PHPCI/Store/Base/BuildMetaStoreBase.php
+++ b/PHPCI/Store/Base/BuildMetaStoreBase.php
@@ -20,11 +20,18 @@ class BuildMetaStoreBase extends Store
     protected $modelName   = '\PHPCI\Model\BuildMeta';
     protected $primaryKey  = 'id';
 
+    /**
+     * Get a BuildMeta by primary key (Id)
+     */
     public function getByPrimaryKey($value, $useConnection = 'read')
     {
         return $this->getById($value, $useConnection);
     }
 
+    /**
+     * Get a single BuildMeta by Id.
+     * @return null|BuildMeta
+     */
     public function getById($value, $useConnection = 'read')
     {
         if (is_null($value)) {
@@ -44,6 +51,10 @@ class BuildMetaStoreBase extends Store
         return null;
     }
 
+    /**
+     * Get multiple BuildMeta by ProjectId.
+     * @return array
+     */
     public function getByProjectId($value, $limit = 1000, $useConnection = 'read')
     {
         if (is_null($value)) {
@@ -72,6 +83,10 @@ class BuildMetaStoreBase extends Store
         }
     }
 
+    /**
+     * Get multiple BuildMeta by BuildId.
+     * @return array
+     */
     public function getByBuildId($value, $limit = 1000, $useConnection = 'read')
     {
         if (is_null($value)) {
diff --git a/PHPCI/Store/Base/BuildStoreBase.php b/PHPCI/Store/Base/BuildStoreBase.php
index 89d3a82f..b8b49cb7 100644
--- a/PHPCI/Store/Base/BuildStoreBase.php
+++ b/PHPCI/Store/Base/BuildStoreBase.php
@@ -20,11 +20,18 @@ class BuildStoreBase extends Store
     protected $modelName   = '\PHPCI\Model\Build';
     protected $primaryKey  = 'id';
 
+    /**
+     * Get a Build by primary key (Id)
+     */
     public function getByPrimaryKey($value, $useConnection = 'read')
     {
         return $this->getById($value, $useConnection);
     }
 
+    /**
+     * Get a single Build by Id.
+     * @return null|Build
+     */
     public function getById($value, $useConnection = 'read')
     {
         if (is_null($value)) {
@@ -44,6 +51,10 @@ class BuildStoreBase extends Store
         return null;
     }
 
+    /**
+     * Get multiple Build by ProjectId.
+     * @return array
+     */
     public function getByProjectId($value, $limit = 1000, $useConnection = 'read')
     {
         if (is_null($value)) {
@@ -72,6 +83,10 @@ class BuildStoreBase extends Store
         }
     }
 
+    /**
+     * Get multiple Build by Status.
+     * @return array
+     */
     public function getByStatus($value, $limit = 1000, $useConnection = 'read')
     {
         if (is_null($value)) {
diff --git a/PHPCI/Store/Base/ProjectGroupStoreBase.php b/PHPCI/Store/Base/ProjectGroupStoreBase.php
index 5b2730ea..c7cd8772 100644
--- a/PHPCI/Store/Base/ProjectGroupStoreBase.php
+++ b/PHPCI/Store/Base/ProjectGroupStoreBase.php
@@ -20,11 +20,18 @@ class ProjectGroupStoreBase extends Store
     protected $modelName   = '\PHPCI\Model\ProjectGroup';
     protected $primaryKey  = 'id';
 
+    /**
+     * Get a ProjectGroup by primary key (Id)
+     */
     public function getByPrimaryKey($value, $useConnection = 'read')
     {
         return $this->getById($value, $useConnection);
     }
 
+    /**
+     * Get a single ProjectGroup by Id.
+     * @return null|ProjectGroup
+     */
     public function getById($value, $useConnection = 'read')
     {
         if (is_null($value)) {
diff --git a/PHPCI/Store/Base/ProjectStoreBase.php b/PHPCI/Store/Base/ProjectStoreBase.php
index c764238d..1e2bf65b 100644
--- a/PHPCI/Store/Base/ProjectStoreBase.php
+++ b/PHPCI/Store/Base/ProjectStoreBase.php
@@ -20,11 +20,18 @@ class ProjectStoreBase extends Store
     protected $modelName   = '\PHPCI\Model\Project';
     protected $primaryKey  = 'id';
 
+    /**
+     * Get a Project by primary key (Id)
+     */
     public function getByPrimaryKey($value, $useConnection = 'read')
     {
         return $this->getById($value, $useConnection);
     }
 
+    /**
+     * Get a single Project by Id.
+     * @return null|Project
+     */
     public function getById($value, $useConnection = 'read')
     {
         if (is_null($value)) {
@@ -44,6 +51,10 @@ class ProjectStoreBase extends Store
         return null;
     }
 
+    /**
+     * Get multiple Project by Title.
+     * @return array
+     */
     public function getByTitle($value, $limit = 1000, $useConnection = 'read')
     {
         if (is_null($value)) {
@@ -72,6 +83,10 @@ class ProjectStoreBase extends Store
         }
     }
 
+    /**
+     * Get multiple Project by GroupId.
+     * @return array
+     */
     public function getByGroupId($value, $limit = 1000, $useConnection = 'read')
     {
         if (is_null($value)) {
diff --git a/PHPCI/Store/Base/UserStoreBase.php b/PHPCI/Store/Base/UserStoreBase.php
index 90d60cb4..c1c6cdf7 100644
--- a/PHPCI/Store/Base/UserStoreBase.php
+++ b/PHPCI/Store/Base/UserStoreBase.php
@@ -20,11 +20,18 @@ class UserStoreBase extends Store
     protected $modelName   = '\PHPCI\Model\User';
     protected $primaryKey  = 'id';
 
+    /**
+     * Get a User by primary key (Id)
+     */
     public function getByPrimaryKey($value, $useConnection = 'read')
     {
         return $this->getById($value, $useConnection);
     }
 
+    /**
+     * Get a single User by Id.
+     * @return null|User
+     */
     public function getById($value, $useConnection = 'read')
     {
         if (is_null($value)) {
@@ -44,6 +51,10 @@ class UserStoreBase extends Store
         return null;
     }
 
+    /**
+     * Get a single User by Email.
+     * @return null|User
+     */
     public function getByEmail($value, $useConnection = 'read')
     {
         if (is_null($value)) {
@@ -63,6 +74,10 @@ class UserStoreBase extends Store
         return null;
     }
 
+    /**
+     * Get a single User by Name.
+     * @return null|User
+     */
     public function getByName($value, $useConnection = 'read')
     {
         if (is_null($value)) {
diff --git a/PHPCI/Worker/BuildWorker.php b/PHPCI/Worker/BuildWorker.php
index 37d2bc20..92ee4ced 100644
--- a/PHPCI/Worker/BuildWorker.php
+++ b/PHPCI/Worker/BuildWorker.php
@@ -171,6 +171,10 @@ class BuildWorker
         $this->run = false;
     }
 
+    /**
+     * Checks if this worker has done the amount of jobs it is allowed to do, and if so tells it to stop
+     * after this job completes.
+     */
     protected function checkJobLimit()
     {
         // Make sure we don't run more than maxJobs jobs on this worker:
@@ -181,11 +185,17 @@ class BuildWorker
         }
     }
 
+    /**
+     * Checks that the job received is actually from PHPCI, and has a valid type.
+     * @param Job $job
+     * @param $jobData
+     * @return bool
+     */
     protected function verifyJob(Job $job, $jobData)
     {
         if (empty($jobData) || !is_array($jobData)) {
             // Probably not from PHPCI.
-            $this->pheanstalk->release($job);
+            $this->pheanstalk->delete($job);
             return false;
         }
 

From 07b92fecf3f6d45781dd938675e55d6d36127be5 Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Fri, 9 Oct 2015 10:14:54 +0100
Subject: [PATCH 265/329] Fixing tests

---
 PHPCI/BuildFactory.php |  2 ++
 PHPCI/Model/Build.php  | 26 ++++++++++++++++++++++++++
 composer.lock          | 10 +++++-----
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/PHPCI/BuildFactory.php b/PHPCI/BuildFactory.php
index 1dbc4017..91e618a8 100644
--- a/PHPCI/BuildFactory.php
+++ b/PHPCI/BuildFactory.php
@@ -66,6 +66,8 @@ class BuildFactory
                 case 'svn':
                     $type = 'SubversionBuild';
                     break;
+                default:
+                    return $build;
             }
 
             $class = '\\PHPCI\\Model\\Build\\' . $type;
diff --git a/PHPCI/Model/Build.php b/PHPCI/Model/Build.php
index be7f4a8a..9374b763 100644
--- a/PHPCI/Model/Build.php
+++ b/PHPCI/Model/Build.php
@@ -30,6 +30,11 @@ class Build extends BuildBase
 
     public $currentBuildPath = null;
 
+    /**
+     * @var \PHPCI\Model\Project $project
+     */
+    protected $project;
+
     /**
     * Get link to commit from another source (i.e. Github)
     */
@@ -249,4 +254,25 @@ class Build extends BuildBase
 
         exec(sprintf(IS_WIN ? 'rmdir /S /Q "%s"' : 'rm -Rf "%s"', $buildPath));
     }
+
+    /**
+     * @param Project $value
+     */
+    public function setProjectObject(\PHPCI\Model\Project $value)
+    {
+        $this->project = $value;
+        return parent::setProjectObject($value);
+    }
+
+    /**
+     * Get the Project model for this Build by Id.
+     */
+    public function getProject()
+    {
+        if (empty($this->project)) {
+            $this->project = parent::getProject();
+        }
+
+        return $this->project;
+    }
 }
diff --git a/composer.lock b/composer.lock
index 0fc6a092..b399ce10 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1781,16 +1781,16 @@
         },
         {
             "name": "sebastian/global-state",
-            "version": "1.0.0",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01"
+                "reference": "23af31f402993cfd94e99cbc4b782e9a78eb0e97"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
-                "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/23af31f402993cfd94e99cbc4b782e9a78eb0e97",
+                "reference": "23af31f402993cfd94e99cbc4b782e9a78eb0e97",
                 "shasum": ""
             },
             "require": {
@@ -1828,7 +1828,7 @@
             "keywords": [
                 "global state"
             ],
-            "time": "2014-10-06 09:23:50"
+            "time": "2015-06-21 15:11:22"
         },
         {
             "name": "sebastian/recursion-context",

From f747371c6ddf1d4326cdfb7260b08037fd9aef4e Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Fri, 9 Oct 2015 10:29:21 +0100
Subject: [PATCH 266/329] Fixing tests #2

---
 PHPCI/Model/Build.php                    | 13 ++++---------
 Tests/PHPCI/Service/BuildServiceTest.php |  6 +++++-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/PHPCI/Model/Build.php b/PHPCI/Model/Build.php
index 9374b763..2f2b64cc 100644
--- a/PHPCI/Model/Build.php
+++ b/PHPCI/Model/Build.php
@@ -30,11 +30,6 @@ class Build extends BuildBase
 
     public $currentBuildPath = null;
 
-    /**
-     * @var \PHPCI\Model\Project $project
-     */
-    protected $project;
-
     /**
     * Get link to commit from another source (i.e. Github)
     */
@@ -260,7 +255,7 @@ class Build extends BuildBase
      */
     public function setProjectObject(\PHPCI\Model\Project $value)
     {
-        $this->project = $value;
+        $this->data['project'] = $value;
         return parent::setProjectObject($value);
     }
 
@@ -269,10 +264,10 @@ class Build extends BuildBase
      */
     public function getProject()
     {
-        if (empty($this->project)) {
-            $this->project = parent::getProject();
+        if (empty($this->data['project'])) {
+            $this->data['project'] = parent::getProject();
         }
 
-        return $this->project;
+        return $this->data['project'];
     }
 }
diff --git a/Tests/PHPCI/Service/BuildServiceTest.php b/Tests/PHPCI/Service/BuildServiceTest.php
index 985f3088..4a396334 100644
--- a/Tests/PHPCI/Service/BuildServiceTest.php
+++ b/Tests/PHPCI/Service/BuildServiceTest.php
@@ -101,9 +101,13 @@ class BuildServiceTest extends \PHPUnit_Framework_TestCase
      */
     public function testExecute_CreateDuplicateBuild()
     {
+        $project = new Project();
+        $project->setType('hg');
+        $project->setId(101);
+
         $build = new Build();
         $build->setId(1);
-        $build->setProjectId(101);
+        $build->setProject($project);
         $build->setCommitId('abcde');
         $build->setStatus(Build::STATUS_FAILED);
         $build->setLog('Test');

From fbc3da59dd6a09e99b7247a1d323fba7b62f9e71 Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Fri, 9 Oct 2015 10:37:50 +0100
Subject: [PATCH 267/329] Fix

---
 PHPCI/Model/Build.php                    | 21 ---------------------
 PHPCI/Service/BuildService.php           | 20 ++++++++++++++------
 Tests/PHPCI/Service/BuildServiceTest.php |  6 +-----
 3 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/PHPCI/Model/Build.php b/PHPCI/Model/Build.php
index 2f2b64cc..be7f4a8a 100644
--- a/PHPCI/Model/Build.php
+++ b/PHPCI/Model/Build.php
@@ -249,25 +249,4 @@ class Build extends BuildBase
 
         exec(sprintf(IS_WIN ? 'rmdir /S /Q "%s"' : 'rm -Rf "%s"', $buildPath));
     }
-
-    /**
-     * @param Project $value
-     */
-    public function setProjectObject(\PHPCI\Model\Project $value)
-    {
-        $this->data['project'] = $value;
-        return parent::setProjectObject($value);
-    }
-
-    /**
-     * Get the Project model for this Build by Id.
-     */
-    public function getProject()
-    {
-        if (empty($this->data['project'])) {
-            $this->data['project'] = parent::getProject();
-        }
-
-        return $this->data['project'];
-    }
 }
diff --git a/PHPCI/Service/BuildService.php b/PHPCI/Service/BuildService.php
index 7db8d474..dca0fc0d 100644
--- a/PHPCI/Service/BuildService.php
+++ b/PHPCI/Service/BuildService.php
@@ -87,9 +87,13 @@ class BuildService
 
         $build = $this->buildStore->save($build);
 
-        $build = BuildFactory::getBuild($build);
-        $build->sendStatusPostback();
-        $this->addBuildToQueue($build);
+        $buildId = $build->getId();
+
+        if (!empty($buildId)) {
+            $build = BuildFactory::getBuild($build);
+            $build->sendStatusPostback();
+            $this->addBuildToQueue($build);
+        }
 
         return $build;
     }
@@ -116,9 +120,13 @@ class BuildService
 
         $build = $this->buildStore->save($build);
 
-        $build = BuildFactory::getBuild($build);
-        $build->sendStatusPostback();
-        $this->addBuildToQueue($build);
+        $buildId = $build->getId();
+
+        if (!empty($buildId)) {
+            $build = BuildFactory::getBuild($build);
+            $build->sendStatusPostback();
+            $this->addBuildToQueue($build);
+        }
 
         return $build;
     }
diff --git a/Tests/PHPCI/Service/BuildServiceTest.php b/Tests/PHPCI/Service/BuildServiceTest.php
index 4a396334..3c96b131 100644
--- a/Tests/PHPCI/Service/BuildServiceTest.php
+++ b/Tests/PHPCI/Service/BuildServiceTest.php
@@ -101,13 +101,9 @@ class BuildServiceTest extends \PHPUnit_Framework_TestCase
      */
     public function testExecute_CreateDuplicateBuild()
     {
-        $project = new Project();
-        $project->setType('hg');
-        $project->setId(101);
-
         $build = new Build();
         $build->setId(1);
-        $build->setProject($project);
+        $build->setProject(101);
         $build->setCommitId('abcde');
         $build->setStatus(Build::STATUS_FAILED);
         $build->setLog('Test');

From 725ce70ae9a7b66c3f116e3ca8dde9f998f1bc8f Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Fri, 9 Oct 2015 10:58:18 +0100
Subject: [PATCH 268/329] Fixing ordering on projects for @REBELinBLUE

---
 PHPCI/Store/ProjectStore.php | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/PHPCI/Store/ProjectStore.php b/PHPCI/Store/ProjectStore.php
index 5f58fcc8..ea46d82b 100644
--- a/PHPCI/Store/ProjectStore.php
+++ b/PHPCI/Store/ProjectStore.php
@@ -66,6 +66,41 @@ class ProjectStore extends ProjectStoreBase
             $count = count($rtn);
 
 
+            return array('items' => $rtn, 'count' => $count);
+        } else {
+            return array('items' => array(), 'count' => 0);
+        }
+    }
+
+    /**
+     * Get multiple Project by GroupId.
+     * @param int $value
+     * @param int $limit
+     * @param string $useConnection
+     * @return array
+     * @throws \Exception
+     */
+    public function getByGroupId($value, $limit = 1000, $useConnection = 'read')
+    {
+        if (is_null($value)) {
+            throw new \Exception('Value passed to ' . __FUNCTION__ . ' cannot be null.');
+        }
+
+        $query = 'SELECT * FROM `project` WHERE `group_id` = :group_id ORDER BY title LIMIT :limit';
+        $stmt = Database::getConnection($useConnection)->prepare($query);
+        $stmt->bindValue(':group_id', $value);
+        $stmt->bindValue(':limit', (int)$limit, \PDO::PARAM_INT);
+
+        if ($stmt->execute()) {
+            $res = $stmt->fetchAll(\PDO::FETCH_ASSOC);
+
+            $map = function ($item) {
+                return new Project($item);
+            };
+            $rtn = array_map($map, $res);
+
+            $count = count($rtn);
+
             return array('items' => $rtn, 'count' => $count);
         } else {
             return array('items' => array(), 'count' => 0);

From 97216b0f4138c664ee2bfd93e335458bcdc9f332 Mon Sep 17 00:00:00 2001
From: Dan Cryer 
Date: Fri, 9 Oct 2015 11:10:14 +0100
Subject: [PATCH 269/329] Fixing login stuff

---
 ...0151009100610_remove_unique_name_index.php | 40 +++++++++++++++++++
 PHPCI/View/User/index.phtml                   |  2 +-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 PHPCI/Migrations/20151009100610_remove_unique_name_index.php

diff --git a/PHPCI/Migrations/20151009100610_remove_unique_name_index.php b/PHPCI/Migrations/20151009100610_remove_unique_name_index.php
new file mode 100644
index 00000000..283dfbc0
--- /dev/null
+++ b/PHPCI/Migrations/20151009100610_remove_unique_name_index.php
@@ -0,0 +1,40 @@
+table('user');
+
+        if ($user->hasIndex('name', array('unique' => true))) {
+            $user->removeIndex('name', array('unique' => true));
+            $user->save();
+        }
+
+        $user->addIndex('name', array('unique' => false));
+        $user->save();
+    }
+}
diff --git a/PHPCI/View/User/index.phtml b/PHPCI/View/User/index.phtml
index 15208667..061be90f 100644
--- a/PHPCI/View/User/index.phtml
+++ b/PHPCI/View/User/index.phtml
@@ -40,7 +40,7 @@
                             
                             
                                 User()->getIsAdmin()): ?>
-                                    
    
+                                    
    
                                         
                                         
    "},{type:"html",id:"Content",label:"spellContent",html:"",setup:function(b){var b=a.iframeNumber+"_"+b._.currentTabId,
+c=document.getElementById(b);a.targetFromFrame[b]=c.contentWindow}},{type:"hbox",id:"bottomGroup",style:"width:560px; margin: 0 auto;",widths:["50%","50%"],children:[{type:"hbox",id:"leftCol",align:"left",width:"50%",children:[{type:"vbox",id:"rightCol1",widths:["50%","50%"],children:[{type:"text",id:"text",label:a.LocalizationLabel.ChangeTo.text+":",labelLayout:"horizontal",labelStyle:"font: 12px/25px arial, sans-serif;",width:"140px","default":"",onShow:function(){a.textNode.SpellTab=this;a.LocalizationLabel.ChangeTo.instance=
+this},onHide:function(){this.reset()}},{type:"hbox",id:"rightCol",align:"right",width:"30%",children:[{type:"vbox",id:"rightCol_col__left",children:[{type:"text",id:"labelSuggestions",label:a.LocalizationLabel.Suggestions.text+":",onShow:function(){a.LocalizationLabel.Suggestions.instance=this;this.getInputElement().hide()}},{type:"html",id:"logo",html:'WebSpellChecker.net',setup:function(){this.getElement().$.src=
+a.logotype;this.getElement().getParent().setStyles({"text-align":"left"})}}]},{type:"select",id:"list_of_suggestions",labelStyle:"font: 12px/25px arial, sans-serif;",size:"6",inputStyle:"width: 140px; height: auto;",items:[["loading..."]],onShow:function(){p=this},onHide:function(){this.clear()},onChange:function(){a.textNode.SpellTab.setValue(this.getValue())}}]}]}]},{type:"hbox",id:"rightCol",align:"right",width:"50%",children:[{type:"vbox",id:"rightCol_col__left",widths:["50%","50%","50%","50%"],
+children:[{type:"button",id:"ChangeTo",label:a.LocalizationButton.ChangeTo.text,title:"Change to",style:"width: 100%;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id);a.LocalizationButton.ChangeTo.instance=this},onClick:c},{type:"button",id:"ChangeAll",label:a.LocalizationButton.ChangeAll.text,title:"Change All",style:"width: 100%;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id);a.LocalizationButton.ChangeAll.instance=this},onClick:c},{type:"button",id:"AddWord",
+label:a.LocalizationButton.AddWord.text,title:"Add word",style:"width: 100%;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id);a.LocalizationButton.AddWord.instance=this},onClick:c},{type:"button",id:"FinishChecking",label:a.LocalizationButton.FinishChecking.text,title:"Finish Checking",style:"width: 100%;margin-top: 9px;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id);a.LocalizationButton.FinishChecking.instance=this},onClick:c}]},{type:"vbox",id:"rightCol_col__right",
+widths:["50%","50%","50%"],children:[{type:"button",id:"IgnoreWord",label:a.LocalizationButton.IgnoreWord.text,title:"Ignore word",style:"width: 100%;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id);a.LocalizationButton.IgnoreWord.instance=this},onClick:c},{type:"button",id:"IgnoreAllWords",label:a.LocalizationButton.IgnoreAllWords.text,title:"Ignore all words",style:"width: 100%;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id);a.LocalizationButton.IgnoreAllWords.instance=
+this},onClick:c},{type:"button",id:"option",label:a.LocalizationButton.Options.text,title:"Option",style:"width: 100%;",onLoad:function(){a.LocalizationButton.Options.instance=this;"file:"==document.location.protocol&&this.disable()},onClick:function(){"file:"==document.location.protocol?alert("WSC: Options functionality is disabled when runing from file system"):b.openDialog("options")}}]}]}]},{type:"hbox",id:"BlockFinishChecking",style:"width:560px; margin: 0 auto;",widths:["70%","30%"],onShow:function(){this.getElement().hide()},
+onHide:l,children:[{type:"hbox",id:"leftCol",align:"left",width:"70%",children:[{type:"vbox",id:"rightCol1",setup:function(){this.getChild()[0].getElement().$.src=a.logotype;this.getChild()[0].getElement().getParent().setStyles({"text-align":"center"})},children:[{type:"html",id:"logo",html:'WebSpellChecker.net'}]}]},{type:"hbox",id:"rightCol",align:"right",width:"30%",children:[{type:"vbox",
+id:"rightCol_col__left",children:[{type:"button",id:"Option_button",label:a.LocalizationButton.Options.text,title:"Option",style:"width: 100%;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id);"file:"==document.location.protocol&&this.disable()},onClick:function(){"file:"==document.location.protocol?alert("WSC: Options functionality is disabled when runing from file system"):b.openDialog("options")}},{type:"button",id:"FinishChecking",label:a.LocalizationButton.FinishChecking.text,
+title:"Finish Checking",style:"width: 100%;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id)},onClick:c}]}]}]}]},{id:"GrammTab",label:"Grammar",accessKey:"G",elements:[{type:"html",id:"banner",label:"banner",style:"",html:"
    "},{type:"html",id:"Content",label:"GrammarContent",html:"",setup:function(){var b=a.iframeNumber+"_"+a.dialog._.currentTabId,c=document.getElementById(b);a.targetFromFrame[b]=c.contentWindow}},{type:"vbox",id:"bottomGroup",style:"width:560px; margin: 0 auto;",
+children:[{type:"hbox",id:"leftCol",widths:["66%","34%"],children:[{type:"vbox",children:[{type:"text",id:"text",label:"Change to:",labelLayout:"horizontal",labelStyle:"font: 12px/25px arial, sans-serif;",inputStyle:"float: right; width: 200px;","default":"",onShow:function(){a.textNode.GrammTab=this},onHide:function(){this.reset()}},{type:"html",id:"html_text",html:"
    ",
+onShow:function(){a.textNodeInfo.GrammTab=this}},{type:"html",id:"radio",html:"",onShow:function(){a.grammerSuggest=this}}]},{type:"vbox",children:[{type:"button",id:"ChangeTo",label:"Change to",title:"Change to",style:"width: 133px; float: right;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id)},onClick:c},{type:"button",id:"IgnoreWord",label:"Ignore word",title:"Ignore word",style:"width: 133px; float: right;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id)},
+onClick:c},{type:"button",id:"IgnoreAllWords",label:"Ignore Problem",title:"Ignore Problem",style:"width: 133px; float: right;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id)},onClick:c},{type:"button",id:"FinishChecking",label:"Finish Checking",title:"Finish Checking",style:"width: 133px; float: right; margin-top: 9px;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id)},onClick:c}]}]}]},{type:"hbox",id:"BlockFinishChecking",style:"width:560px; margin: 0 auto;",
+widths:["70%","30%"],onShow:function(){this.getElement().hide()},onHide:l,children:[{type:"hbox",id:"leftCol",align:"left",width:"70%",children:[{type:"vbox",id:"rightCol1",children:[{type:"html",id:"logo",html:'WebSpellChecker.net',setup:function(){this.getElement().$.src=a.logotype;this.getElement().getParent().setStyles({"text-align":"center"})}}]}]},{type:"hbox",id:"rightCol",align:"right",
+width:"30%",children:[{type:"vbox",id:"rightCol_col__left",children:[{type:"button",id:"FinishChecking",label:"Finish Checking",title:"Finish Checking",style:"width: 100%;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id)},onClick:c}]}]}]}]},{id:"Thesaurus",label:"Thesaurus",accessKey:"T",elements:[{type:"html",id:"banner",label:"banner",style:"",html:"
    "},{type:"html",id:"Content",label:"spellContent",html:"",setup:function(){var b=a.iframeNumber+"_"+a.dialog._.currentTabId,
+c=document.getElementById(b);a.targetFromFrame[b]=c.contentWindow}},{type:"vbox",id:"bottomGroup",style:"width:560px; margin: -10px auto; overflow: hidden;",children:[{type:"hbox",widths:["75%","25%"],children:[{type:"vbox",children:[{type:"hbox",widths:["65%","35%"],children:[{type:"text",id:"ChangeTo",label:"Change to:",labelLayout:"horizontal",inputStyle:"width: 160px;",labelStyle:"font: 12px/25px arial, sans-serif;","default":"",onShow:function(){a.textNode.Thesaurus=this},onHide:function(){this.reset()}},
+{type:"button",id:"ChangeTo",label:"Change to",title:"Change to",style:"width: 121px; margin-top: 1px;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id)},onClick:c}]},{type:"hbox",children:[{type:"select",id:"categories",label:"Categories:",labelStyle:"font: 12px/25px arial, sans-serif;",size:"5",inputStyle:"width: 180px; height: auto;",items:[],onShow:function(){a.selectNode.categories=this},onHide:function(){this.clear()},onChange:function(){a.buildOptionSynonyms(this.getValue())}},
+{type:"select",id:"synonyms",label:"Synonyms:",labelStyle:"font: 12px/25px arial, sans-serif;",size:"5",inputStyle:"width: 180px; height: auto;",items:[],onShow:function(){a.selectNode.synonyms=this;a.textNode.Thesaurus.setValue(this.getValue())},onHide:function(){this.clear()},onChange:function(){a.textNode.Thesaurus.setValue(this.getValue())}}]}]},{type:"vbox",width:"120px",style:"margin-top:46px;",children:[{type:"html",id:"logotype",label:"WebSpellChecker.net",html:'WebSpellChecker.net',
+setup:function(){this.getElement().$.src=a.logotype;this.getElement().getParent().setStyles({"text-align":"center"})}},{type:"button",id:"FinishChecking",label:"Finish Checking",title:"Finish Checking",style:"width: 121px; float: right; margin-top: 9px;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id)},onClick:c}]}]}]},{type:"hbox",id:"BlockFinishChecking",style:"width:560px; margin: 0 auto;",widths:["70%","30%"],onShow:function(){this.getElement().hide()},children:[{type:"hbox",
+id:"leftCol",align:"left",width:"70%",children:[{type:"vbox",id:"rightCol1",children:[{type:"html",id:"logo",html:'WebSpellChecker.net',setup:function(){this.getElement().$.src=a.logotype;this.getElement().getParent().setStyles({"text-align":"center"})}}]}]},{type:"hbox",id:"rightCol",align:"right",width:"30%",children:[{type:"vbox",id:"rightCol_col__left",children:[{type:"button",id:"FinishChecking",
+label:"Finish Checking",title:"Finish Checking",style:"width: 100%;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id)},onClick:c}]}]}]}]}]}});CKEDITOR.dialog.add("options",function(){var b=null,c={},d={},f=null,g=null;e.cookie.get("udn");e.cookie.get("osp");var h=function(){g=this.getElement().getAttribute("title-cmd");var a=[];a[0]=d.IgnoreAllCapsWords;a[1]=d.IgnoreWordsNumbers;a[2]=d.IgnoreMixedCaseWords;a[3]=d.IgnoreDomainNames;a=a.toString().replace(/,/g,"");e.cookie.set("osp",
+a);e.cookie.set("udnCmd",g?g:"ignore");"delete"!=g&&(a="",""!==j.getValue()&&(a=j.getValue()),e.cookie.set("udn",a));e.postMessage.send({id:"options_dic_send"})},i=function(){f.getElement().setHtml(a.LocalizationComing.error);f.getElement().show()};return{title:a.LocalizationComing.Options,minWidth:430,minHeight:130,resizable:CKEDITOR.DIALOG_RESIZE_NONE,contents:[{id:"OptionsTab",label:"Options",accessKey:"O",elements:[{type:"hbox",id:"options_error",children:[{type:"html",style:"display: block;text-align: center;white-space: normal!important; font-size: 12px;color:red",
+html:"
    ",onShow:function(){f=this}}]},{type:"vbox",id:"Options_content",children:[{type:"hbox",id:"Options_manager",widths:["52%","48%"],children:[{type:"fieldset",label:"Spell Checking Options",style:"border: none;margin-top: 13px;padding: 10px 0 10px 10px",onShow:function(){this.getInputElement().$.children[0].innerHTML=a.LocalizationComing.SpellCheckingOptions},children:[{type:"vbox",id:"Options_checkbox",children:[{type:"checkbox",id:"IgnoreAllCapsWords",label:"Ignore All-Caps Words",
+labelStyle:"margin-left: 5px; font: 12px/16px arial, sans-serif;display: inline-block;white-space: normal;",style:"float:left; min-height: 16px;","default":"",onClick:function(){d[this.id]=!this.getValue()?0:1}},{type:"checkbox",id:"IgnoreWordsNumbers",label:"Ignore Words with Numbers",labelStyle:"margin-left: 5px; font: 12px/16px arial, sans-serif;display: inline-block;white-space: normal;",style:"float:left; min-height: 16px;","default":"",onClick:function(){d[this.id]=!this.getValue()?0:1}},{type:"checkbox",
+id:"IgnoreMixedCaseWords",label:"Ignore Mixed-Case Words",labelStyle:"margin-left: 5px; font: 12px/16px arial, sans-serif;display: inline-block;white-space: normal;",style:"float:left; min-height: 16px;","default":"",onClick:function(){d[this.id]=!this.getValue()?0:1}},{type:"checkbox",id:"IgnoreDomainNames",label:"Ignore Domain Names",labelStyle:"margin-left: 5px; font: 12px/16px arial, sans-serif;display: inline-block;white-space: normal;",style:"float:left; min-height: 16px;","default":"",onClick:function(){d[this.id]=
+!this.getValue()?0:1}}]}]},{type:"vbox",id:"Options_DictionaryName",children:[{type:"text",id:"DictionaryName",style:"margin-bottom: 10px",label:"Dictionary Name:",labelLayout:"vertical",labelStyle:"font: 12px/25px arial, sans-serif;","default":"",onLoad:function(){j=this;this.setValue(a.userDictionaryName?a.userDictionaryName:(e.cookie.get("udn"),this.getValue()))},onShow:function(){j=this;this.setValue(!e.cookie.get("udn")?this.getValue():e.cookie.get("udn"));this.setLabel(a.LocalizationComing.DictionaryName)},
+onHide:function(){this.reset()}},{type:"hbox",id:"Options_buttons",children:[{type:"vbox",id:"Options_leftCol_col",widths:["50%","50%"],children:[{type:"button",id:"create",label:"Create",title:"Create",style:"width: 100%;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id)},onShow:function(){this.getElement().setText(a.LocalizationComing.Create)},onClick:h},{type:"button",id:"restore",label:"Restore",title:"Restore",style:"width: 100%;",onLoad:function(){this.getElement().setAttribute("title-cmd",
+this.id)},onShow:function(){this.getElement().setText(a.LocalizationComing.Restore)},onClick:h}]},{type:"vbox",id:"Options_rightCol_col",widths:["50%","50%"],children:[{type:"button",id:"rename",label:"Rename",title:"Rename",style:"width: 100%;",onLoad:function(){this.getElement().setAttribute("title-cmd",this.id)},onShow:function(){this.getElement().setText(a.LocalizationComing.Rename)},onClick:h},{type:"button",id:"delete",label:"Remove",title:"Remove",style:"width: 100%;",onLoad:function(){this.getElement().setAttribute("title-cmd",
+this.id)},onShow:function(){this.getElement().setText(a.LocalizationComing.Remove)},onClick:h}]}]}]}]},{type:"hbox",id:"Options_text",children:[{type:"html",style:"text-align: justify;margin-top: 15px;white-space: normal!important; font-size: 12px;color:#777;",html:"
    "+a.LocalizationComing.OptionsTextIntro+"
    ",onShow:function(){this.getElement().setText(a.LocalizationComing.OptionsTextIntro)}}]}]}]}],buttons:[CKEDITOR.dialog.okButton,CKEDITOR.dialog.cancelButton],onOk:function(){var a=[];
+a[0]=d.IgnoreAllCapsWords;a[1]=d.IgnoreWordsNumbers;a[2]=d.IgnoreMixedCaseWords;a[3]=d.IgnoreDomainNames;a=a.toString().replace(/,/g,"");e.cookie.set("osp",a);e.cookie.set("udn",j.getValue());e.postMessage.send({id:"options_checkbox_send"});f.getElement().hide();f.getElement().setHtml(" ")},onLoad:function(){b=this;e.postMessage.init(i);c.IgnoreAllCapsWords=b.getContentElement("OptionsTab","IgnoreAllCapsWords");c.IgnoreWordsNumbers=b.getContentElement("OptionsTab","IgnoreWordsNumbers");c.IgnoreMixedCaseWords=
+b.getContentElement("OptionsTab","IgnoreMixedCaseWords");c.IgnoreDomainNames=b.getContentElement("OptionsTab","IgnoreDomainNames")},onShow:function(){var b=e.cookie.get("osp").split("");d.IgnoreAllCapsWords=b[0];d.IgnoreWordsNumbers=b[1];d.IgnoreMixedCaseWords=b[2];d.IgnoreDomainNames=b[3];!parseInt(d.IgnoreAllCapsWords,10)?c.IgnoreAllCapsWords.setValue("",!1):c.IgnoreAllCapsWords.setValue("checked",!1);!parseInt(d.IgnoreWordsNumbers,10)?c.IgnoreWordsNumbers.setValue("",!1):c.IgnoreWordsNumbers.setValue("checked",
+!1);!parseInt(d.IgnoreMixedCaseWords,10)?c.IgnoreMixedCaseWords.setValue("",!1):c.IgnoreMixedCaseWords.setValue("checked",!1);!parseInt(d.IgnoreDomainNames,10)?c.IgnoreDomainNames.setValue("",!1):c.IgnoreDomainNames.setValue("checked",!1);d.IgnoreAllCapsWords=!c.IgnoreAllCapsWords.getValue()?0:1;d.IgnoreWordsNumbers=!c.IgnoreWordsNumbers.getValue()?0:1;d.IgnoreMixedCaseWords=!c.IgnoreMixedCaseWords.getValue()?0:1;d.IgnoreDomainNames=!c.IgnoreDomainNames.getValue()?0:1;c.IgnoreAllCapsWords.getElement().$.lastChild.innerHTML=
+a.LocalizationComing.IgnoreAllCapsWords;c.IgnoreWordsNumbers.getElement().$.lastChild.innerHTML=a.LocalizationComing.IgnoreWordsWithNumbers;c.IgnoreMixedCaseWords.getElement().$.lastChild.innerHTML=a.LocalizationComing.IgnoreMixedCaseWords;c.IgnoreDomainNames.getElement().$.lastChild.innerHTML=a.LocalizationComing.IgnoreDomainNames}}});CKEDITOR.dialog.on("resize",function(b){var b=b.data,c=b.dialog,d=CKEDITOR.document.getById(a.iframeNumber+"_"+c._.currentTabId);"checkspell"==c._.name&&(a.bnr?d&&
+d.setSize("height",b.height-310):d&&d.setSize("height",b.height-220))});CKEDITOR.on("dialogDefinition",function(b){var c=b.data.definition;a.onLoadOverlay=new q({opacity:"1",background:"#fff",target:c.dialog.parts.tabs.getParent().$});a.onLoadOverlay.setEnable();c.dialog.on("show",function(){});c.dialog.on("cancel",function(){c.dialog.getParentEditor().config.wsc_onClose.call(this.document.getWindow().getFrame());a.div_overlay.setDisable();return!1},this,null,-1)})})();
\ No newline at end of file
diff --git a/public/assets/plugins/ckeditor/plugins/wsc/dialogs/wsc_ie.js b/public/assets/plugins/ckeditor/plugins/wsc/dialogs/wsc_ie.js
new file mode 100644
index 00000000..6b39b006
--- /dev/null
+++ b/public/assets/plugins/ckeditor/plugins/wsc/dialogs/wsc_ie.js
@@ -0,0 +1,11 @@
+/*
+ Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
+ For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+CKEDITOR.dialog.add("checkspell",function(a){function c(a,c){var d=0;return function(){"function"==typeof window.doSpell?("undefined"!=typeof e&&window.clearInterval(e),j(a)):180==d++&&window._cancelOnError(c)}}function j(c){var f=new window._SP_FCK_LangCompare,b=CKEDITOR.getUrl(a.plugins.wsc.path+"dialogs/"),e=b+"tmpFrameset.html";window.gFCKPluginName="wsc";f.setDefaulLangCode(a.config.defaultLanguage);window.doSpell({ctrl:g,lang:a.config.wsc_lang||f.getSPLangCode(a.langCode),intLang:a.config.wsc_uiLang||
+f.getSPLangCode(a.langCode),winType:d,onCancel:function(){c.hide()},onFinish:function(b){a.focus();c.getParentEditor().setData(b.value);c.hide()},staticFrame:e,framesetPath:e,iframePath:b+"ciframe.html",schemaURI:b+"wsc.css",userDictionaryName:a.config.wsc_userDictionaryName,customDictionaryName:a.config.wsc_customDictionaryIds&&a.config.wsc_customDictionaryIds.split(","),domainName:a.config.wsc_domainName});CKEDITOR.document.getById(h).setStyle("display","none");CKEDITOR.document.getById(d).setStyle("display",
+"block")}var b=CKEDITOR.tools.getNextNumber(),d="cke_frame_"+b,g="cke_data_"+b,h="cke_error_"+b,e,b=document.location.protocol||"http:",i=a.lang.wsc.notAvailable,k='',
+l=a.config.wsc_customLoaderScript||b+"//loader.webspellchecker.net/sproxy_fck/sproxy.php?plugin=fck2&customerid="+a.config.wsc_customerId+"&cmd=script&doc=wsc&schema=22";a.config.wsc_customLoaderScript&&(i+='
    '+a.lang.wsc.errorLoading.replace(/%s/g,a.config.wsc_customLoaderScript)+"
    ");window._cancelOnError=function(c){if("undefined"==typeof window.WSC_Error){CKEDITOR.document.getById(d).setStyle("display",
+"none");var b=CKEDITOR.document.getById(h);b.setStyle("display","block");b.setHtml(c||a.lang.wsc.notAvailable)}};return{title:a.config.wsc_dialogTitle||a.lang.wsc.title,minWidth:485,minHeight:380,buttons:[CKEDITOR.dialog.cancelButton],onShow:function(){var b=this.getContentElement("general","content").getElement();b.setHtml(k);b.getChild(2).setStyle("height",this._.contentSize.height+"px");"function"!=typeof window.doSpell&&CKEDITOR.document.getHead().append(CKEDITOR.document.createElement("script",
+{attributes:{type:"text/javascript",src:l}}));b=a.getData();CKEDITOR.document.getById(g).setValue(b);e=window.setInterval(c(this,i),250)},onHide:function(){window.ooo=void 0;window.int_framsetLoaded=void 0;window.framesetLoaded=void 0;window.is_window_opened=!1},contents:[{id:"general",label:a.config.wsc_dialogTitle||a.lang.wsc.title,padding:0,elements:[{type:"html",id:"content",html:""}]}]}});
+CKEDITOR.dialog.on("resize",function(a){var a=a.data,c=a.dialog;"checkspell"==c._.name&&((c=(c=c.getContentElement("general","content").getElement())&&c.getChild(2))&&c.setSize("height",a.height),c&&c.setSize("width",a.width))});
\ No newline at end of file
diff --git a/public/assets/plugins/ckeditor/skins/moono/dialog.css b/public/assets/plugins/ckeditor/skins/moono/dialog.css
new file mode 100644
index 00000000..29bbaf9f
--- /dev/null
+++ b/public/assets/plugins/ckeditor/skins/moono/dialog.css
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#eaeaea;border:1px solid #b2b2b2;border-bottom-color:#999;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 0 3px rgba(0,0,0,.15);-webkit-box-shadow:0 0 3px rgba(0,0,0,.15);box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_browser_gecko19 .cke_dialog_body{position:relative}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:13px;cursor:move;position:relative;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #999;padding:6px 10px;-moz-border-radius:2px 2px 0 0;-webkit-border-radius:2px 2px 0 0;border-radius:2px 2px 0 0;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#cfd1cf));background-image:-moz-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-webkit-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-o-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-ms-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:linear-gradient(top,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:30px;border-top:1px solid #bfbfbf;-moz-border-radius:0 0 3px 3px;-webkit-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px}.cke_dialog_contents_body{overflow:auto;padding:17px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border:0;outline:1px solid #bfbfbf;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;-moz-border-radius:0 0 2px 2px;-webkit-border-radius:0 0 2px 2px;border-radius:0 0 2px 2px;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#ebebeb),to(#cfd1cf));background-image:-moz-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-webkit-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-o-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-ms-linear-gradient(top,#ebebeb,#cfd1cf);background-image:linear-gradient(top,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:24px;display:inline-block;margin:5px 0 0;position:absolute;z-index:2;left:10px}.cke_rtl .cke_dialog_tabs{right:10px}a.cke_dialog_tab{height:16px;padding:4px 8px;margin-right:3px;display:inline-block;cursor:pointer;line-height:16px;outline:0;color:#595959;border:1px solid #bfbfbf;-moz-border-radius:3px 3px 0 0;-webkit-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;background:#d4d4d4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fafafa),to(#ededed));background-image:-moz-linear-gradient(top,#fafafa,#ededed);background-image:-webkit-linear-gradient(top,#fafafa,#ededed);background-image:-o-linear-gradient(top,#fafafa,#ededed);background-image:-ms-linear-gradient(top,#fafafa,#ededed);background-image:linear-gradient(top,#fafafa,#ededed);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#fafafa',endColorstr='#ededed')}.cke_rtl a.cke_dialog_tab{margin-right:0;margin-left:3px}a.cke_dialog_tab:hover{background:#ebebeb;background:-moz-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#ebebeb),color-stop(100%,#dfdfdf));background:-webkit-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:-o-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:-ms-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:linear-gradient(to bottom,#ebebeb 0,#dfdfdf 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ebebeb',endColorstr='#dfdfdf',GradientType=0)}a.cke_dialog_tab_selected{background:#fff;color:#383838;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover{background:#ededed;background:-moz-linear-gradient(top,#ededed 0,#fff 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#ededed),color-stop(100%,#fff));background:-webkit-linear-gradient(top,#ededed 0,#fff 100%);background:-o-linear-gradient(top,#ededed 0,#fff 100%);background:-ms-linear-gradient(top,#ededed 0,#fff 100%);background:linear-gradient(to bottom,#ededed 0,#fff 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed',endColorstr='#ffffff',GradientType=0)}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:0 0;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:5px;z-index:5}.cke_hidpi .cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}.cke_dialog_close_button span{display:none}.cke_hc .cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}.cke_ltr .cke_dialog_close_button{right:5px}.cke_rtl .cke_dialog_close_button{left:6px}.cke_dialog_close_button{top:4px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:4px 6px;outline:0;width:100%;*width:95%;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9;border-top-color:#a0a6ad}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:1px solid #139ff7;border-top-color:#1392e9}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:3px 0;margin:0;text-align:center;color:#333;vertical-align:middle;cursor:pointer;border:1px solid #b6b6b6;border-bottom-color:#999;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e4e4e4));background-image:-moz-linear-gradient(top,#fff,#e4e4e4);background-image:-webkit-linear-gradient(top,#fff,#e4e4e4);background-image:-o-linear-gradient(top,#fff,#e4e4e4);background-image:-ms-linear-gradient(top,#fff,#e4e4e4);background-image:linear-gradient(top,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}span.cke_dialog_ui_button{padding:0 12px}a.cke_dialog_ui_button:hover{border-color:#9e9e9e;background:#ccc;background-image:-webkit-gradient(linear,left top,left bottom,from(#f2f2f2),to(#ccc));background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:-ms-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(top,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border-color:#969696;outline:0;-moz-box-shadow:0 0 6px rgba(0,0,0,.4) inset;-webkit-box-shadow:0 0 6px rgba(0,0,0,.4) inset;box-shadow:0 0 6px rgba(0,0,0,.4) inset}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid;padding-top:1px;padding-bottom:1px}.cke_hc a.cke_dialog_ui_button:hover span,.cke_hc a.cke_dialog_ui_button:focus span,.cke_hc a.cke_dialog_ui_button:active span{padding-left:10px;padding-right:10px}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;line-height:20px}a.cke_dialog_ui_button_ok{color:#fff;text-shadow:0 -1px 0 #55830c;border-color:#62a60a #62a60a #4d9200;background:#69b10b;background-image:-webkit-gradient(linear,0 0,0 100%,from(#9ad717),to(#69b10b));background-image:-webkit-linear-gradient(top,#9ad717,#69b10b);background-image:-o-linear-gradient(top,#9ad717,#69b10b);background-image:linear-gradient(to bottom,#9ad717,#69b10b);background-image:-moz-linear-gradient(top,#9ad717,#69b10b);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#9ad717',endColorstr='#69b10b')}a.cke_dialog_ui_button_ok:hover{border-color:#5b9909 #5b9909 #478500;background:#88be14;background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#88be14),color-stop(100%,#5d9c0a));background:-webkit-linear-gradient(top,#88be14 0,#5d9c0a 100%);background:-o-linear-gradient(top,#88be14 0,#5d9c0a 100%);background:linear-gradient(to bottom,#88be14 0,#5d9c0a 100%);background:-moz-linear-gradient(top,#88be14 0,#5d9c0a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#88be14',endColorstr='#5d9c0a',GradientType=0)}a.cke_dialog_ui_button span{text-shadow:0 1px 0 #fff}a.cke_dialog_ui_button_ok span{text-shadow:0 -1px 0 #55830c}span.cke_dialog_ui_button{cursor:pointer}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active,a.cke_dialog_ui_button_cancel:focus,a.cke_dialog_ui_button_cancel:active{border-width:2px;padding:2px 0}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#568c0a}a.cke_dialog_ui_button_ok:focus span,a.cke_dialog_ui_button_ok:active span,a.cke_dialog_ui_button_cancel:focus span,a.cke_dialog_ui_button_cancel:active span{padding:0 11px}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:24px;line-height:24px;background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:2px 6px;outline:0;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog .cke_dark_background{background-color:#dedede}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog .cke_btn_over{border:outset 1px;cursor:pointer}.cke_dialog .ImagePreviewBox{border:2px ridge black;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:2px ridge black;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;margin-bottom:auto;cursor:default}.cke_dialog_body label.cke_required{font-weight:bold}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:1px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_dialog_ui_checkbox_input:focus,.cke_dialog_ui_radio_input:focus,.cke_btn_over{outline:1px dotted #696969}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}
\ No newline at end of file
diff --git a/public/assets/plugins/ckeditor/skins/moono/dialog_ie.css b/public/assets/plugins/ckeditor/skins/moono/dialog_ie.css
new file mode 100644
index 00000000..153b05cb
--- /dev/null
+++ b/public/assets/plugins/ckeditor/skins/moono/dialog_ie.css
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#eaeaea;border:1px solid #b2b2b2;border-bottom-color:#999;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 0 3px rgba(0,0,0,.15);-webkit-box-shadow:0 0 3px rgba(0,0,0,.15);box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_browser_gecko19 .cke_dialog_body{position:relative}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:13px;cursor:move;position:relative;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #999;padding:6px 10px;-moz-border-radius:2px 2px 0 0;-webkit-border-radius:2px 2px 0 0;border-radius:2px 2px 0 0;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#cfd1cf));background-image:-moz-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-webkit-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-o-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-ms-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:linear-gradient(top,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:30px;border-top:1px solid #bfbfbf;-moz-border-radius:0 0 3px 3px;-webkit-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px}.cke_dialog_contents_body{overflow:auto;padding:17px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border:0;outline:1px solid #bfbfbf;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;-moz-border-radius:0 0 2px 2px;-webkit-border-radius:0 0 2px 2px;border-radius:0 0 2px 2px;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#ebebeb),to(#cfd1cf));background-image:-moz-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-webkit-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-o-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-ms-linear-gradient(top,#ebebeb,#cfd1cf);background-image:linear-gradient(top,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:24px;display:inline-block;margin:5px 0 0;position:absolute;z-index:2;left:10px}.cke_rtl .cke_dialog_tabs{right:10px}a.cke_dialog_tab{height:16px;padding:4px 8px;margin-right:3px;display:inline-block;cursor:pointer;line-height:16px;outline:0;color:#595959;border:1px solid #bfbfbf;-moz-border-radius:3px 3px 0 0;-webkit-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;background:#d4d4d4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fafafa),to(#ededed));background-image:-moz-linear-gradient(top,#fafafa,#ededed);background-image:-webkit-linear-gradient(top,#fafafa,#ededed);background-image:-o-linear-gradient(top,#fafafa,#ededed);background-image:-ms-linear-gradient(top,#fafafa,#ededed);background-image:linear-gradient(top,#fafafa,#ededed);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#fafafa',endColorstr='#ededed')}.cke_rtl a.cke_dialog_tab{margin-right:0;margin-left:3px}a.cke_dialog_tab:hover{background:#ebebeb;background:-moz-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#ebebeb),color-stop(100%,#dfdfdf));background:-webkit-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:-o-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:-ms-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:linear-gradient(to bottom,#ebebeb 0,#dfdfdf 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ebebeb',endColorstr='#dfdfdf',GradientType=0)}a.cke_dialog_tab_selected{background:#fff;color:#383838;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover{background:#ededed;background:-moz-linear-gradient(top,#ededed 0,#fff 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#ededed),color-stop(100%,#fff));background:-webkit-linear-gradient(top,#ededed 0,#fff 100%);background:-o-linear-gradient(top,#ededed 0,#fff 100%);background:-ms-linear-gradient(top,#ededed 0,#fff 100%);background:linear-gradient(to bottom,#ededed 0,#fff 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed',endColorstr='#ffffff',GradientType=0)}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:0 0;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:5px;z-index:5}.cke_hidpi .cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}.cke_dialog_close_button span{display:none}.cke_hc .cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}.cke_ltr .cke_dialog_close_button{right:5px}.cke_rtl .cke_dialog_close_button{left:6px}.cke_dialog_close_button{top:4px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:4px 6px;outline:0;width:100%;*width:95%;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9;border-top-color:#a0a6ad}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:1px solid #139ff7;border-top-color:#1392e9}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:3px 0;margin:0;text-align:center;color:#333;vertical-align:middle;cursor:pointer;border:1px solid #b6b6b6;border-bottom-color:#999;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e4e4e4));background-image:-moz-linear-gradient(top,#fff,#e4e4e4);background-image:-webkit-linear-gradient(top,#fff,#e4e4e4);background-image:-o-linear-gradient(top,#fff,#e4e4e4);background-image:-ms-linear-gradient(top,#fff,#e4e4e4);background-image:linear-gradient(top,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}span.cke_dialog_ui_button{padding:0 12px}a.cke_dialog_ui_button:hover{border-color:#9e9e9e;background:#ccc;background-image:-webkit-gradient(linear,left top,left bottom,from(#f2f2f2),to(#ccc));background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:-ms-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(top,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border-color:#969696;outline:0;-moz-box-shadow:0 0 6px rgba(0,0,0,.4) inset;-webkit-box-shadow:0 0 6px rgba(0,0,0,.4) inset;box-shadow:0 0 6px rgba(0,0,0,.4) inset}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid;padding-top:1px;padding-bottom:1px}.cke_hc a.cke_dialog_ui_button:hover span,.cke_hc a.cke_dialog_ui_button:focus span,.cke_hc a.cke_dialog_ui_button:active span{padding-left:10px;padding-right:10px}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;line-height:20px}a.cke_dialog_ui_button_ok{color:#fff;text-shadow:0 -1px 0 #55830c;border-color:#62a60a #62a60a #4d9200;background:#69b10b;background-image:-webkit-gradient(linear,0 0,0 100%,from(#9ad717),to(#69b10b));background-image:-webkit-linear-gradient(top,#9ad717,#69b10b);background-image:-o-linear-gradient(top,#9ad717,#69b10b);background-image:linear-gradient(to bottom,#9ad717,#69b10b);background-image:-moz-linear-gradient(top,#9ad717,#69b10b);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#9ad717',endColorstr='#69b10b')}a.cke_dialog_ui_button_ok:hover{border-color:#5b9909 #5b9909 #478500;background:#88be14;background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#88be14),color-stop(100%,#5d9c0a));background:-webkit-linear-gradient(top,#88be14 0,#5d9c0a 100%);background:-o-linear-gradient(top,#88be14 0,#5d9c0a 100%);background:linear-gradient(to bottom,#88be14 0,#5d9c0a 100%);background:-moz-linear-gradient(top,#88be14 0,#5d9c0a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#88be14',endColorstr='#5d9c0a',GradientType=0)}a.cke_dialog_ui_button span{text-shadow:0 1px 0 #fff}a.cke_dialog_ui_button_ok span{text-shadow:0 -1px 0 #55830c}span.cke_dialog_ui_button{cursor:pointer}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active,a.cke_dialog_ui_button_cancel:focus,a.cke_dialog_ui_button_cancel:active{border-width:2px;padding:2px 0}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#568c0a}a.cke_dialog_ui_button_ok:focus span,a.cke_dialog_ui_button_ok:active span,a.cke_dialog_ui_button_cancel:focus span,a.cke_dialog_ui_button_cancel:active span{padding:0 11px}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:24px;line-height:24px;background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:2px 6px;outline:0;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog .cke_dark_background{background-color:#dedede}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog .cke_btn_over{border:outset 1px;cursor:pointer}.cke_dialog .ImagePreviewBox{border:2px ridge black;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:2px ridge black;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;margin-bottom:auto;cursor:default}.cke_dialog_body label.cke_required{font-weight:bold}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:1px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_dialog_ui_checkbox_input:focus,.cke_dialog_ui_radio_input:focus,.cke_btn_over{outline:1px dotted #696969}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}
\ No newline at end of file
diff --git a/public/assets/plugins/ckeditor/skins/moono/dialog_ie7.css b/public/assets/plugins/ckeditor/skins/moono/dialog_ie7.css
new file mode 100644
index 00000000..459e72b8
--- /dev/null
+++ b/public/assets/plugins/ckeditor/skins/moono/dialog_ie7.css
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#eaeaea;border:1px solid #b2b2b2;border-bottom-color:#999;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 0 3px rgba(0,0,0,.15);-webkit-box-shadow:0 0 3px rgba(0,0,0,.15);box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_browser_gecko19 .cke_dialog_body{position:relative}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:13px;cursor:move;position:relative;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #999;padding:6px 10px;-moz-border-radius:2px 2px 0 0;-webkit-border-radius:2px 2px 0 0;border-radius:2px 2px 0 0;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#cfd1cf));background-image:-moz-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-webkit-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-o-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-ms-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:linear-gradient(top,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:30px;border-top:1px solid #bfbfbf;-moz-border-radius:0 0 3px 3px;-webkit-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px}.cke_dialog_contents_body{overflow:auto;padding:17px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border:0;outline:1px solid #bfbfbf;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;-moz-border-radius:0 0 2px 2px;-webkit-border-radius:0 0 2px 2px;border-radius:0 0 2px 2px;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#ebebeb),to(#cfd1cf));background-image:-moz-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-webkit-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-o-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-ms-linear-gradient(top,#ebebeb,#cfd1cf);background-image:linear-gradient(top,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:24px;display:inline-block;margin:5px 0 0;position:absolute;z-index:2;left:10px}.cke_rtl .cke_dialog_tabs{right:10px}a.cke_dialog_tab{height:16px;padding:4px 8px;margin-right:3px;display:inline-block;cursor:pointer;line-height:16px;outline:0;color:#595959;border:1px solid #bfbfbf;-moz-border-radius:3px 3px 0 0;-webkit-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;background:#d4d4d4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fafafa),to(#ededed));background-image:-moz-linear-gradient(top,#fafafa,#ededed);background-image:-webkit-linear-gradient(top,#fafafa,#ededed);background-image:-o-linear-gradient(top,#fafafa,#ededed);background-image:-ms-linear-gradient(top,#fafafa,#ededed);background-image:linear-gradient(top,#fafafa,#ededed);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#fafafa',endColorstr='#ededed')}.cke_rtl a.cke_dialog_tab{margin-right:0;margin-left:3px}a.cke_dialog_tab:hover{background:#ebebeb;background:-moz-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#ebebeb),color-stop(100%,#dfdfdf));background:-webkit-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:-o-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:-ms-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:linear-gradient(to bottom,#ebebeb 0,#dfdfdf 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ebebeb',endColorstr='#dfdfdf',GradientType=0)}a.cke_dialog_tab_selected{background:#fff;color:#383838;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover{background:#ededed;background:-moz-linear-gradient(top,#ededed 0,#fff 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#ededed),color-stop(100%,#fff));background:-webkit-linear-gradient(top,#ededed 0,#fff 100%);background:-o-linear-gradient(top,#ededed 0,#fff 100%);background:-ms-linear-gradient(top,#ededed 0,#fff 100%);background:linear-gradient(to bottom,#ededed 0,#fff 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed',endColorstr='#ffffff',GradientType=0)}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:0 0;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:5px;z-index:5}.cke_hidpi .cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}.cke_dialog_close_button span{display:none}.cke_hc .cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}.cke_ltr .cke_dialog_close_button{right:5px}.cke_rtl .cke_dialog_close_button{left:6px}.cke_dialog_close_button{top:4px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:4px 6px;outline:0;width:100%;*width:95%;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9;border-top-color:#a0a6ad}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:1px solid #139ff7;border-top-color:#1392e9}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:3px 0;margin:0;text-align:center;color:#333;vertical-align:middle;cursor:pointer;border:1px solid #b6b6b6;border-bottom-color:#999;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e4e4e4));background-image:-moz-linear-gradient(top,#fff,#e4e4e4);background-image:-webkit-linear-gradient(top,#fff,#e4e4e4);background-image:-o-linear-gradient(top,#fff,#e4e4e4);background-image:-ms-linear-gradient(top,#fff,#e4e4e4);background-image:linear-gradient(top,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}span.cke_dialog_ui_button{padding:0 12px}a.cke_dialog_ui_button:hover{border-color:#9e9e9e;background:#ccc;background-image:-webkit-gradient(linear,left top,left bottom,from(#f2f2f2),to(#ccc));background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:-ms-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(top,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border-color:#969696;outline:0;-moz-box-shadow:0 0 6px rgba(0,0,0,.4) inset;-webkit-box-shadow:0 0 6px rgba(0,0,0,.4) inset;box-shadow:0 0 6px rgba(0,0,0,.4) inset}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid;padding-top:1px;padding-bottom:1px}.cke_hc a.cke_dialog_ui_button:hover span,.cke_hc a.cke_dialog_ui_button:focus span,.cke_hc a.cke_dialog_ui_button:active span{padding-left:10px;padding-right:10px}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;line-height:20px}a.cke_dialog_ui_button_ok{color:#fff;text-shadow:0 -1px 0 #55830c;border-color:#62a60a #62a60a #4d9200;background:#69b10b;background-image:-webkit-gradient(linear,0 0,0 100%,from(#9ad717),to(#69b10b));background-image:-webkit-linear-gradient(top,#9ad717,#69b10b);background-image:-o-linear-gradient(top,#9ad717,#69b10b);background-image:linear-gradient(to bottom,#9ad717,#69b10b);background-image:-moz-linear-gradient(top,#9ad717,#69b10b);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#9ad717',endColorstr='#69b10b')}a.cke_dialog_ui_button_ok:hover{border-color:#5b9909 #5b9909 #478500;background:#88be14;background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#88be14),color-stop(100%,#5d9c0a));background:-webkit-linear-gradient(top,#88be14 0,#5d9c0a 100%);background:-o-linear-gradient(top,#88be14 0,#5d9c0a 100%);background:linear-gradient(to bottom,#88be14 0,#5d9c0a 100%);background:-moz-linear-gradient(top,#88be14 0,#5d9c0a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#88be14',endColorstr='#5d9c0a',GradientType=0)}a.cke_dialog_ui_button span{text-shadow:0 1px 0 #fff}a.cke_dialog_ui_button_ok span{text-shadow:0 -1px 0 #55830c}span.cke_dialog_ui_button{cursor:pointer}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active,a.cke_dialog_ui_button_cancel:focus,a.cke_dialog_ui_button_cancel:active{border-width:2px;padding:2px 0}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#568c0a}a.cke_dialog_ui_button_ok:focus span,a.cke_dialog_ui_button_ok:active span,a.cke_dialog_ui_button_cancel:focus span,a.cke_dialog_ui_button_cancel:active span{padding:0 11px}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:24px;line-height:24px;background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:2px 6px;outline:0;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog .cke_dark_background{background-color:#dedede}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog .cke_btn_over{border:outset 1px;cursor:pointer}.cke_dialog .ImagePreviewBox{border:2px ridge black;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:2px ridge black;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;margin-bottom:auto;cursor:default}.cke_dialog_body label.cke_required{font-weight:bold}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:1px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_dialog_ui_checkbox_input:focus,.cke_dialog_ui_radio_input:focus,.cke_btn_over{outline:1px dotted #696969}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}.cke_dialog_title{zoom:1}.cke_dialog_footer{border-top:1px solid #bfbfbf}.cke_dialog_footer_buttons{position:static}.cke_dialog_footer_buttons a.cke_dialog_ui_button{vertical-align:top}.cke_dialog .cke_resizer_ltr{padding-left:4px}.cke_dialog .cke_resizer_rtl{padding-right:4px}.cke_dialog_ui_input_text,.cke_dialog_ui_input_password,.cke_dialog_ui_input_textarea,.cke_dialog_ui_input_select{padding:0!important}.cke_dialog_ui_checkbox_input,.cke_dialog_ui_ratio_input,.cke_btn_reset,.cke_btn_locked,.cke_btn_unlocked{border:1px solid transparent!important}
\ No newline at end of file
diff --git a/public/assets/plugins/ckeditor/skins/moono/dialog_ie8.css b/public/assets/plugins/ckeditor/skins/moono/dialog_ie8.css
new file mode 100644
index 00000000..74e9fa88
--- /dev/null
+++ b/public/assets/plugins/ckeditor/skins/moono/dialog_ie8.css
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#eaeaea;border:1px solid #b2b2b2;border-bottom-color:#999;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 0 3px rgba(0,0,0,.15);-webkit-box-shadow:0 0 3px rgba(0,0,0,.15);box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_browser_gecko19 .cke_dialog_body{position:relative}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:13px;cursor:move;position:relative;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #999;padding:6px 10px;-moz-border-radius:2px 2px 0 0;-webkit-border-radius:2px 2px 0 0;border-radius:2px 2px 0 0;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#cfd1cf));background-image:-moz-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-webkit-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-o-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-ms-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:linear-gradient(top,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:30px;border-top:1px solid #bfbfbf;-moz-border-radius:0 0 3px 3px;-webkit-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px}.cke_dialog_contents_body{overflow:auto;padding:17px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border:0;outline:1px solid #bfbfbf;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;-moz-border-radius:0 0 2px 2px;-webkit-border-radius:0 0 2px 2px;border-radius:0 0 2px 2px;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#ebebeb),to(#cfd1cf));background-image:-moz-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-webkit-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-o-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-ms-linear-gradient(top,#ebebeb,#cfd1cf);background-image:linear-gradient(top,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:24px;display:inline-block;margin:5px 0 0;position:absolute;z-index:2;left:10px}.cke_rtl .cke_dialog_tabs{right:10px}a.cke_dialog_tab{height:16px;padding:4px 8px;margin-right:3px;display:inline-block;cursor:pointer;line-height:16px;outline:0;color:#595959;border:1px solid #bfbfbf;-moz-border-radius:3px 3px 0 0;-webkit-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;background:#d4d4d4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fafafa),to(#ededed));background-image:-moz-linear-gradient(top,#fafafa,#ededed);background-image:-webkit-linear-gradient(top,#fafafa,#ededed);background-image:-o-linear-gradient(top,#fafafa,#ededed);background-image:-ms-linear-gradient(top,#fafafa,#ededed);background-image:linear-gradient(top,#fafafa,#ededed);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#fafafa',endColorstr='#ededed')}.cke_rtl a.cke_dialog_tab{margin-right:0;margin-left:3px}a.cke_dialog_tab:hover{background:#ebebeb;background:-moz-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#ebebeb),color-stop(100%,#dfdfdf));background:-webkit-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:-o-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:-ms-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:linear-gradient(to bottom,#ebebeb 0,#dfdfdf 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ebebeb',endColorstr='#dfdfdf',GradientType=0)}a.cke_dialog_tab_selected{background:#fff;color:#383838;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover{background:#ededed;background:-moz-linear-gradient(top,#ededed 0,#fff 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#ededed),color-stop(100%,#fff));background:-webkit-linear-gradient(top,#ededed 0,#fff 100%);background:-o-linear-gradient(top,#ededed 0,#fff 100%);background:-ms-linear-gradient(top,#ededed 0,#fff 100%);background:linear-gradient(to bottom,#ededed 0,#fff 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed',endColorstr='#ffffff',GradientType=0)}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:0 0;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:5px;z-index:5}.cke_hidpi .cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}.cke_dialog_close_button span{display:none}.cke_hc .cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}.cke_ltr .cke_dialog_close_button{right:5px}.cke_rtl .cke_dialog_close_button{left:6px}.cke_dialog_close_button{top:4px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:4px 6px;outline:0;width:100%;*width:95%;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9;border-top-color:#a0a6ad}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:1px solid #139ff7;border-top-color:#1392e9}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:3px 0;margin:0;text-align:center;color:#333;vertical-align:middle;cursor:pointer;border:1px solid #b6b6b6;border-bottom-color:#999;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e4e4e4));background-image:-moz-linear-gradient(top,#fff,#e4e4e4);background-image:-webkit-linear-gradient(top,#fff,#e4e4e4);background-image:-o-linear-gradient(top,#fff,#e4e4e4);background-image:-ms-linear-gradient(top,#fff,#e4e4e4);background-image:linear-gradient(top,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}span.cke_dialog_ui_button{padding:0 12px}a.cke_dialog_ui_button:hover{border-color:#9e9e9e;background:#ccc;background-image:-webkit-gradient(linear,left top,left bottom,from(#f2f2f2),to(#ccc));background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:-ms-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(top,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border-color:#969696;outline:0;-moz-box-shadow:0 0 6px rgba(0,0,0,.4) inset;-webkit-box-shadow:0 0 6px rgba(0,0,0,.4) inset;box-shadow:0 0 6px rgba(0,0,0,.4) inset}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid;padding-top:1px;padding-bottom:1px}.cke_hc a.cke_dialog_ui_button:hover span,.cke_hc a.cke_dialog_ui_button:focus span,.cke_hc a.cke_dialog_ui_button:active span{padding-left:10px;padding-right:10px}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;line-height:20px}a.cke_dialog_ui_button_ok{color:#fff;text-shadow:0 -1px 0 #55830c;border-color:#62a60a #62a60a #4d9200;background:#69b10b;background-image:-webkit-gradient(linear,0 0,0 100%,from(#9ad717),to(#69b10b));background-image:-webkit-linear-gradient(top,#9ad717,#69b10b);background-image:-o-linear-gradient(top,#9ad717,#69b10b);background-image:linear-gradient(to bottom,#9ad717,#69b10b);background-image:-moz-linear-gradient(top,#9ad717,#69b10b);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#9ad717',endColorstr='#69b10b')}a.cke_dialog_ui_button_ok:hover{border-color:#5b9909 #5b9909 #478500;background:#88be14;background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#88be14),color-stop(100%,#5d9c0a));background:-webkit-linear-gradient(top,#88be14 0,#5d9c0a 100%);background:-o-linear-gradient(top,#88be14 0,#5d9c0a 100%);background:linear-gradient(to bottom,#88be14 0,#5d9c0a 100%);background:-moz-linear-gradient(top,#88be14 0,#5d9c0a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#88be14',endColorstr='#5d9c0a',GradientType=0)}a.cke_dialog_ui_button span{text-shadow:0 1px 0 #fff}a.cke_dialog_ui_button_ok span{text-shadow:0 -1px 0 #55830c}span.cke_dialog_ui_button{cursor:pointer}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active,a.cke_dialog_ui_button_cancel:focus,a.cke_dialog_ui_button_cancel:active{border-width:2px;padding:2px 0}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#568c0a}a.cke_dialog_ui_button_ok:focus span,a.cke_dialog_ui_button_ok:active span,a.cke_dialog_ui_button_cancel:focus span,a.cke_dialog_ui_button_cancel:active span{padding:0 11px}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:24px;line-height:24px;background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:2px 6px;outline:0;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog .cke_dark_background{background-color:#dedede}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog .cke_btn_over{border:outset 1px;cursor:pointer}.cke_dialog .ImagePreviewBox{border:2px ridge black;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:2px ridge black;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;margin-bottom:auto;cursor:default}.cke_dialog_body label.cke_required{font-weight:bold}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:1px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_dialog_ui_checkbox_input:focus,.cke_dialog_ui_radio_input:focus,.cke_btn_over{outline:1px dotted #696969}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}a.cke_dialog_ui_button_ok:focus span,a.cke_dialog_ui_button_ok:active span,a.cke_dialog_ui_button_cancel:focus span,a.cke_dialog_ui_button_cancel:active span{display:block}
\ No newline at end of file
diff --git a/public/assets/plugins/ckeditor/skins/moono/dialog_iequirks.css b/public/assets/plugins/ckeditor/skins/moono/dialog_iequirks.css
new file mode 100644
index 00000000..1c8e0558
--- /dev/null
+++ b/public/assets/plugins/ckeditor/skins/moono/dialog_iequirks.css
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#eaeaea;border:1px solid #b2b2b2;border-bottom-color:#999;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 0 3px rgba(0,0,0,.15);-webkit-box-shadow:0 0 3px rgba(0,0,0,.15);box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_browser_gecko19 .cke_dialog_body{position:relative}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:13px;cursor:move;position:relative;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #999;padding:6px 10px;-moz-border-radius:2px 2px 0 0;-webkit-border-radius:2px 2px 0 0;border-radius:2px 2px 0 0;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#cfd1cf));background-image:-moz-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-webkit-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-o-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-ms-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:linear-gradient(top,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:30px;border-top:1px solid #bfbfbf;-moz-border-radius:0 0 3px 3px;-webkit-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px}.cke_dialog_contents_body{overflow:auto;padding:17px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border:0;outline:1px solid #bfbfbf;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;-moz-border-radius:0 0 2px 2px;-webkit-border-radius:0 0 2px 2px;border-radius:0 0 2px 2px;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#ebebeb),to(#cfd1cf));background-image:-moz-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-webkit-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-o-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-ms-linear-gradient(top,#ebebeb,#cfd1cf);background-image:linear-gradient(top,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:24px;display:inline-block;margin:5px 0 0;position:absolute;z-index:2;left:10px}.cke_rtl .cke_dialog_tabs{right:10px}a.cke_dialog_tab{height:16px;padding:4px 8px;margin-right:3px;display:inline-block;cursor:pointer;line-height:16px;outline:0;color:#595959;border:1px solid #bfbfbf;-moz-border-radius:3px 3px 0 0;-webkit-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;background:#d4d4d4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fafafa),to(#ededed));background-image:-moz-linear-gradient(top,#fafafa,#ededed);background-image:-webkit-linear-gradient(top,#fafafa,#ededed);background-image:-o-linear-gradient(top,#fafafa,#ededed);background-image:-ms-linear-gradient(top,#fafafa,#ededed);background-image:linear-gradient(top,#fafafa,#ededed);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#fafafa',endColorstr='#ededed')}.cke_rtl a.cke_dialog_tab{margin-right:0;margin-left:3px}a.cke_dialog_tab:hover{background:#ebebeb;background:-moz-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#ebebeb),color-stop(100%,#dfdfdf));background:-webkit-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:-o-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:-ms-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:linear-gradient(to bottom,#ebebeb 0,#dfdfdf 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ebebeb',endColorstr='#dfdfdf',GradientType=0)}a.cke_dialog_tab_selected{background:#fff;color:#383838;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover{background:#ededed;background:-moz-linear-gradient(top,#ededed 0,#fff 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#ededed),color-stop(100%,#fff));background:-webkit-linear-gradient(top,#ededed 0,#fff 100%);background:-o-linear-gradient(top,#ededed 0,#fff 100%);background:-ms-linear-gradient(top,#ededed 0,#fff 100%);background:linear-gradient(to bottom,#ededed 0,#fff 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed',endColorstr='#ffffff',GradientType=0)}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:0 0;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:5px;z-index:5}.cke_hidpi .cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}.cke_dialog_close_button span{display:none}.cke_hc .cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}.cke_ltr .cke_dialog_close_button{right:5px}.cke_rtl .cke_dialog_close_button{left:6px}.cke_dialog_close_button{top:4px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:4px 6px;outline:0;width:100%;*width:95%;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9;border-top-color:#a0a6ad}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:1px solid #139ff7;border-top-color:#1392e9}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:3px 0;margin:0;text-align:center;color:#333;vertical-align:middle;cursor:pointer;border:1px solid #b6b6b6;border-bottom-color:#999;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e4e4e4));background-image:-moz-linear-gradient(top,#fff,#e4e4e4);background-image:-webkit-linear-gradient(top,#fff,#e4e4e4);background-image:-o-linear-gradient(top,#fff,#e4e4e4);background-image:-ms-linear-gradient(top,#fff,#e4e4e4);background-image:linear-gradient(top,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}span.cke_dialog_ui_button{padding:0 12px}a.cke_dialog_ui_button:hover{border-color:#9e9e9e;background:#ccc;background-image:-webkit-gradient(linear,left top,left bottom,from(#f2f2f2),to(#ccc));background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:-ms-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(top,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border-color:#969696;outline:0;-moz-box-shadow:0 0 6px rgba(0,0,0,.4) inset;-webkit-box-shadow:0 0 6px rgba(0,0,0,.4) inset;box-shadow:0 0 6px rgba(0,0,0,.4) inset}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid;padding-top:1px;padding-bottom:1px}.cke_hc a.cke_dialog_ui_button:hover span,.cke_hc a.cke_dialog_ui_button:focus span,.cke_hc a.cke_dialog_ui_button:active span{padding-left:10px;padding-right:10px}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;line-height:20px}a.cke_dialog_ui_button_ok{color:#fff;text-shadow:0 -1px 0 #55830c;border-color:#62a60a #62a60a #4d9200;background:#69b10b;background-image:-webkit-gradient(linear,0 0,0 100%,from(#9ad717),to(#69b10b));background-image:-webkit-linear-gradient(top,#9ad717,#69b10b);background-image:-o-linear-gradient(top,#9ad717,#69b10b);background-image:linear-gradient(to bottom,#9ad717,#69b10b);background-image:-moz-linear-gradient(top,#9ad717,#69b10b);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#9ad717',endColorstr='#69b10b')}a.cke_dialog_ui_button_ok:hover{border-color:#5b9909 #5b9909 #478500;background:#88be14;background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#88be14),color-stop(100%,#5d9c0a));background:-webkit-linear-gradient(top,#88be14 0,#5d9c0a 100%);background:-o-linear-gradient(top,#88be14 0,#5d9c0a 100%);background:linear-gradient(to bottom,#88be14 0,#5d9c0a 100%);background:-moz-linear-gradient(top,#88be14 0,#5d9c0a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#88be14',endColorstr='#5d9c0a',GradientType=0)}a.cke_dialog_ui_button span{text-shadow:0 1px 0 #fff}a.cke_dialog_ui_button_ok span{text-shadow:0 -1px 0 #55830c}span.cke_dialog_ui_button{cursor:pointer}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active,a.cke_dialog_ui_button_cancel:focus,a.cke_dialog_ui_button_cancel:active{border-width:2px;padding:2px 0}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#568c0a}a.cke_dialog_ui_button_ok:focus span,a.cke_dialog_ui_button_ok:active span,a.cke_dialog_ui_button_cancel:focus span,a.cke_dialog_ui_button_cancel:active span{padding:0 11px}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:24px;line-height:24px;background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:2px 6px;outline:0;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog .cke_dark_background{background-color:#dedede}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog .cke_btn_over{border:outset 1px;cursor:pointer}.cke_dialog .ImagePreviewBox{border:2px ridge black;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:2px ridge black;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;margin-bottom:auto;cursor:default}.cke_dialog_body label.cke_required{font-weight:bold}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:1px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_dialog_ui_checkbox_input:focus,.cke_dialog_ui_radio_input:focus,.cke_btn_over{outline:1px dotted #696969}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}.cke_dialog_footer{filter:""}
\ No newline at end of file
diff --git a/public/assets/plugins/ckeditor/skins/moono/dialog_opera.css b/public/assets/plugins/ckeditor/skins/moono/dialog_opera.css
new file mode 100644
index 00000000..742ce731
--- /dev/null
+++ b/public/assets/plugins/ckeditor/skins/moono/dialog_opera.css
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#eaeaea;border:1px solid #b2b2b2;border-bottom-color:#999;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 0 3px rgba(0,0,0,.15);-webkit-box-shadow:0 0 3px rgba(0,0,0,.15);box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_browser_gecko19 .cke_dialog_body{position:relative}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:13px;cursor:move;position:relative;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #999;padding:6px 10px;-moz-border-radius:2px 2px 0 0;-webkit-border-radius:2px 2px 0 0;border-radius:2px 2px 0 0;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#cfd1cf));background-image:-moz-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-webkit-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-o-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-ms-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:linear-gradient(top,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:30px;border-top:1px solid #bfbfbf;-moz-border-radius:0 0 3px 3px;-webkit-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px}.cke_dialog_contents_body{overflow:auto;padding:17px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border:0;outline:1px solid #bfbfbf;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;-moz-border-radius:0 0 2px 2px;-webkit-border-radius:0 0 2px 2px;border-radius:0 0 2px 2px;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#ebebeb),to(#cfd1cf));background-image:-moz-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-webkit-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-o-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-ms-linear-gradient(top,#ebebeb,#cfd1cf);background-image:linear-gradient(top,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:24px;display:inline-block;margin:5px 0 0;position:absolute;z-index:2;left:10px}.cke_rtl .cke_dialog_tabs{right:10px}a.cke_dialog_tab{height:16px;padding:4px 8px;margin-right:3px;display:inline-block;cursor:pointer;line-height:16px;outline:0;color:#595959;border:1px solid #bfbfbf;-moz-border-radius:3px 3px 0 0;-webkit-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;background:#d4d4d4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fafafa),to(#ededed));background-image:-moz-linear-gradient(top,#fafafa,#ededed);background-image:-webkit-linear-gradient(top,#fafafa,#ededed);background-image:-o-linear-gradient(top,#fafafa,#ededed);background-image:-ms-linear-gradient(top,#fafafa,#ededed);background-image:linear-gradient(top,#fafafa,#ededed);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#fafafa',endColorstr='#ededed')}.cke_rtl a.cke_dialog_tab{margin-right:0;margin-left:3px}a.cke_dialog_tab:hover{background:#ebebeb;background:-moz-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#ebebeb),color-stop(100%,#dfdfdf));background:-webkit-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:-o-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:-ms-linear-gradient(top,#ebebeb 0,#dfdfdf 100%);background:linear-gradient(to bottom,#ebebeb 0,#dfdfdf 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ebebeb',endColorstr='#dfdfdf',GradientType=0)}a.cke_dialog_tab_selected{background:#fff;color:#383838;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover{background:#ededed;background:-moz-linear-gradient(top,#ededed 0,#fff 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#ededed),color-stop(100%,#fff));background:-webkit-linear-gradient(top,#ededed 0,#fff 100%);background:-o-linear-gradient(top,#ededed 0,#fff 100%);background:-ms-linear-gradient(top,#ededed 0,#fff 100%);background:linear-gradient(to bottom,#ededed 0,#fff 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed',endColorstr='#ffffff',GradientType=0)}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:0 0;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:5px;z-index:5}.cke_hidpi .cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}.cke_dialog_close_button span{display:none}.cke_hc .cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}.cke_ltr .cke_dialog_close_button{right:5px}.cke_rtl .cke_dialog_close_button{left:6px}.cke_dialog_close_button{top:4px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:4px 6px;outline:0;width:100%;*width:95%;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9;border-top-color:#a0a6ad}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:1px solid #139ff7;border-top-color:#1392e9}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:3px 0;margin:0;text-align:center;color:#333;vertical-align:middle;cursor:pointer;border:1px solid #b6b6b6;border-bottom-color:#999;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e4e4e4));background-image:-moz-linear-gradient(top,#fff,#e4e4e4);background-image:-webkit-linear-gradient(top,#fff,#e4e4e4);background-image:-o-linear-gradient(top,#fff,#e4e4e4);background-image:-ms-linear-gradient(top,#fff,#e4e4e4);background-image:linear-gradient(top,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}span.cke_dialog_ui_button{padding:0 12px}a.cke_dialog_ui_button:hover{border-color:#9e9e9e;background:#ccc;background-image:-webkit-gradient(linear,left top,left bottom,from(#f2f2f2),to(#ccc));background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:-ms-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(top,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border-color:#969696;outline:0;-moz-box-shadow:0 0 6px rgba(0,0,0,.4) inset;-webkit-box-shadow:0 0 6px rgba(0,0,0,.4) inset;box-shadow:0 0 6px rgba(0,0,0,.4) inset}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid;padding-top:1px;padding-bottom:1px}.cke_hc a.cke_dialog_ui_button:hover span,.cke_hc a.cke_dialog_ui_button:focus span,.cke_hc a.cke_dialog_ui_button:active span{padding-left:10px;padding-right:10px}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;line-height:20px}a.cke_dialog_ui_button_ok{color:#fff;text-shadow:0 -1px 0 #55830c;border-color:#62a60a #62a60a #4d9200;background:#69b10b;background-image:-webkit-gradient(linear,0 0,0 100%,from(#9ad717),to(#69b10b));background-image:-webkit-linear-gradient(top,#9ad717,#69b10b);background-image:-o-linear-gradient(top,#9ad717,#69b10b);background-image:linear-gradient(to bottom,#9ad717,#69b10b);background-image:-moz-linear-gradient(top,#9ad717,#69b10b);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#9ad717',endColorstr='#69b10b')}a.cke_dialog_ui_button_ok:hover{border-color:#5b9909 #5b9909 #478500;background:#88be14;background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#88be14),color-stop(100%,#5d9c0a));background:-webkit-linear-gradient(top,#88be14 0,#5d9c0a 100%);background:-o-linear-gradient(top,#88be14 0,#5d9c0a 100%);background:linear-gradient(to bottom,#88be14 0,#5d9c0a 100%);background:-moz-linear-gradient(top,#88be14 0,#5d9c0a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#88be14',endColorstr='#5d9c0a',GradientType=0)}a.cke_dialog_ui_button span{text-shadow:0 1px 0 #fff}a.cke_dialog_ui_button_ok span{text-shadow:0 -1px 0 #55830c}span.cke_dialog_ui_button{cursor:pointer}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active,a.cke_dialog_ui_button_cancel:focus,a.cke_dialog_ui_button_cancel:active{border-width:2px;padding:2px 0}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#568c0a}a.cke_dialog_ui_button_ok:focus span,a.cke_dialog_ui_button_ok:active span,a.cke_dialog_ui_button_cancel:focus span,a.cke_dialog_ui_button_cancel:active span{padding:0 11px}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:24px;line-height:24px;background-color:#fff;border:1px solid #c9cccf;border-top-color:#aeb3b9;padding:2px 6px;outline:0;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.15) inset;box-shadow:0 1px 2px rgba(0,0,0,.15) inset}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog .cke_dark_background{background-color:#dedede}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog .cke_btn_over{border:outset 1px;cursor:pointer}.cke_dialog .ImagePreviewBox{border:2px ridge black;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:2px ridge black;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;margin-bottom:auto;cursor:default}.cke_dialog_body label.cke_required{font-weight:bold}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:1px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_dialog_ui_checkbox_input:focus,.cke_dialog_ui_radio_input:focus,.cke_btn_over{outline:1px dotted #696969}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_dialog_footer{display:block;height:38px}.cke_ltr .cke_dialog_footer>*{float:right}.cke_rtl .cke_dialog_footer>*{float:left}
\ No newline at end of file
diff --git a/public/assets/plugins/ckeditor/skins/moono/editor.css b/public/assets/plugins/ckeditor/skins/moono/editor.css
new file mode 100644
index 00000000..2df84822
--- /dev/null
+++ b/public/assets/plugins/ckeditor/skins/moono/editor.css
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;position:static;-webkit-transition:none;-moz-transition:none;-ms-transition:none;transition:none}.cke_reset_all,.cke_reset_all *{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;position:static;-webkit-transition:none;-moz-transition:none;-ms-transition:none;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box}.cke_chrome{display:block;border:1px solid #b6b6b6;padding:0;-moz-box-shadow:0 0 3px rgba(0,0,0,.15);-webkit-box-shadow:0 0 3px rgba(0,0,0,.15);box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #b6b6b6;padding:6px 8px 2px;white-space:normal;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#cfd1cf));background-image:-moz-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-webkit-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-o-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-ms-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:linear-gradient(top,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_float .cke_top{border:1px solid #b6b6b6;border-bottom-color:#999}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #bfbfbf;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#ebebeb),to(#cfd1cf));background-image:-moz-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-webkit-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-o-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-ms-linear-gradient(top,#ebebeb,#cfd1cf);background-image:linear-gradient(top,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.3);-webkit-box-shadow:0 1px 0 rgba(255,255,255,.3);box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 0 3px rgba(0,0,0,.15);-webkit-box-shadow:0 0 3px rgba(0,0,0,.15);box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2;-moz-box-shadow:0 0 2px rgba(0,0,0,.1) inset;-webkit-box-shadow:0 0 2px rgba(0,0,0,.1) inset;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2;-moz-box-shadow:0 0 2px rgba(0,0,0,.1) inset;-webkit-box-shadow:0 0 2px rgba(0,0,0,.1) inset;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;-moz-border-radius:2px 2px 0 0;-webkit-border-radius:2px 2px 0 0;border-radius:2px 2px 0 0;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#cfd1cf));background-image:-moz-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-webkit-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-o-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-ms-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:linear-gradient(top,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e4e4e4));background-image:-moz-linear-gradient(top,#fff,#e4e4e4);background-image:-webkit-linear-gradient(top,#fff,#e4e4e4);background-image:-o-linear-gradient(top,#fff,#e4e4e4);background-image:-ms-linear-gradient(top,#fff,#e4e4e4);background-image:linear-gradient(top,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup *:first-child{-moz-border-radius:0 2px 2px 0;-webkit-border-radius:0 2px 2px 0;border-radius:0 2px 2px 0}.cke_rtl .cke_toolgroup *:last-child{-moz-border-radius:2px 0 0 2px;-webkit-border-radius:2px 0 0 2px;border-radius:2px 0 0 2px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}.cke_button_on{-moz-box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);-webkit-box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);background:#b5b5b5;background-image:-webkit-gradient(linear,left top,left bottom,from(#aaa),to(#cacaca));background-image:-moz-linear-gradient(top,#aaa,#cacaca);background-image:-webkit-linear-gradient(top,#aaa,#cacaca);background-image:-o-linear-gradient(top,#aaa,#cacaca);background-image:-ms-linear-gradient(top,#aaa,#cacaca);background-image:linear-gradient(top,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{-moz-box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2);-webkit-box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2);box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{-moz-box-shadow:0 0 1px rgba(0,0,0,.3) inset;-webkit-box-shadow:0 0 1px rgba(0,0,0,.3) inset;box-shadow:0 0 1px rgba(0,0,0,.3) inset;background:#ccc;background-image:-webkit-gradient(linear,left top,left bottom,from(#f2f2f2),to(#ccc));background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:-ms-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(top,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;-webkit-box-shadow:1px 0 1px rgba(255,255,255,.5);-moz-box-shadow:1px 0 1px rgba(255,255,255,.5);box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;-webkit-box-shadow:-1px 0 1px rgba(255,255,255,.1);-moz-box-shadow:-1px 0 1px rgba(255,255,255,.1);box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e4e4e4));background-image:-moz-linear-gradient(top,#fff,#e4e4e4);background-image:-webkit-linear-gradient(top,#fff,#e4e4e4);background-image:-o-linear-gradient(top,#fff,#e4e4e4);background-image:-ms-linear-gradient(top,#fff,#e4e4e4);background-image:linear-gradient(top,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_toolbox_collapser:hover{background:#ccc;background-image:-webkit-gradient(linear,left top,left bottom,from(#f2f2f2),to(#ccc));background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:-ms-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(top,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;-moz-box-shadow:0 0 2px rgba(0,0,0,.1) inset;-webkit-box-shadow:0 0 2px rgba(0,0,0,.1) inset;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_button{display:inline-block;float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e4e4e4));background-image:-moz-linear-gradient(top,#fff,#e4e4e4);background-image:-webkit-linear-gradient(top,#fff,#e4e4e4);background-image:-o-linear-gradient(top,#fff,#e4e4e4);background-image:-ms-linear-gradient(top,#fff,#e4e4e4);background-image:linear-gradient(top,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ccc;background-image:-webkit-gradient(linear,left top,left bottom,from(#f2f2f2),to(#ccc));background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:-ms-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(top,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc');outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{border:1px solid #777;-moz-box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;background:#b5b5b5;background-image:-webkit-gradient(linear,left top,left bottom,from(#aaa),to(#cacaca));background-image:-moz-linear-gradient(top,#aaa,#cacaca);background-image:-webkit-linear-gradient(top,#aaa,#cacaca);background-image:-o-linear-gradient(top,#aaa,#cacaca);background-image:-ms-linear-gradient(top,#aaa,#cacaca);background-image:linear-gradient(top,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{-moz-box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2);-webkit-box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2);box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}.cke_path_item,.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5);-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px;-moz-box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5);-webkit-box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5);box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_button__about_icon {background: url(icons.png) no-repeat 0 -0px !important;}.cke_button__bold_icon {background: url(icons.png) no-repeat 0 -24px !important;}.cke_button__italic_icon {background: url(icons.png) no-repeat 0 -48px !important;}.cke_button__strike_icon {background: url(icons.png) no-repeat 0 -72px !important;}.cke_button__subscript_icon {background: url(icons.png) no-repeat 0 -96px !important;}.cke_button__superscript_icon {background: url(icons.png) no-repeat 0 -120px !important;}.cke_button__underline_icon {background: url(icons.png) no-repeat 0 -144px !important;}.cke_button__blockquote_icon {background: url(icons.png) no-repeat 0 -168px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png) no-repeat 0 -192px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png) no-repeat 0 -216px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png) no-repeat 0 -240px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png) no-repeat 0 -264px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png) no-repeat 0 -288px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png) no-repeat 0 -312px !important;}.cke_button__horizontalrule_icon {background: url(icons.png) no-repeat 0 -336px !important;}.cke_button__image_icon {background: url(icons.png) no-repeat 0 -360px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png) no-repeat 0 -384px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png) no-repeat 0 -408px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png) no-repeat 0 -432px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png) no-repeat 0 -456px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png) no-repeat 0 -480px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png) no-repeat 0 -504px !important;}.cke_button__link_icon {background: url(icons.png) no-repeat 0 -528px !important;}.cke_button__unlink_icon {background: url(icons.png) no-repeat 0 -552px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png) no-repeat 0 -576px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png) no-repeat 0 -600px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png) no-repeat 0 -624px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png) no-repeat 0 -648px !important;}.cke_button__maximize_icon {background: url(icons.png) no-repeat 0 -672px !important;}.cke_rtl .cke_button__pastetext_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons.png) no-repeat 0 -696px !important;}.cke_ltr .cke_button__pastetext_icon {background: url(icons.png) no-repeat 0 -720px !important;}.cke_rtl .cke_button__pastefromword_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons.png) no-repeat 0 -744px !important;}.cke_ltr .cke_button__pastefromword_icon {background: url(icons.png) no-repeat 0 -768px !important;}.cke_button__removeformat_icon {background: url(icons.png) no-repeat 0 -792px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png) no-repeat 0 -816px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png) no-repeat 0 -840px !important;}.cke_button__specialchar_icon {background: url(icons.png) no-repeat 0 -864px !important;}.cke_button__scayt_icon {background: url(icons.png) no-repeat 0 -888px !important;}.cke_button__table_icon {background: url(icons.png) no-repeat 0 -912px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png) no-repeat 0 -936px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png) no-repeat 0 -960px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png) no-repeat 0 -984px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png) no-repeat 0 -1008px !important;}.cke_button__spellchecker_icon {background: url(icons.png) no-repeat 0 -1032px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastetext_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons_hidpi.png) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon {background: url(icons_hidpi.png) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons_hidpi.png) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon {background: url(icons_hidpi.png) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_hidpi .cke_button__specialchar_icon {background: url(icons_hidpi.png) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_hidpi .cke_button__scayt_icon {background: url(icons_hidpi.png) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png) no-repeat 0 -960px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png) no-repeat 0 -984px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png) no-repeat 0 -1008px !important;background-size: 16px !important;}.cke_hidpi .cke_button__spellchecker_icon {background: url(icons_hidpi.png) no-repeat 0 -1032px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/public/assets/plugins/ckeditor/skins/moono/editor_gecko.css b/public/assets/plugins/ckeditor/skins/moono/editor_gecko.css
new file mode 100644
index 00000000..ecb7990a
--- /dev/null
+++ b/public/assets/plugins/ckeditor/skins/moono/editor_gecko.css
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;position:static;-webkit-transition:none;-moz-transition:none;-ms-transition:none;transition:none}.cke_reset_all,.cke_reset_all *{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;position:static;-webkit-transition:none;-moz-transition:none;-ms-transition:none;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box}.cke_chrome{display:block;border:1px solid #b6b6b6;padding:0;-moz-box-shadow:0 0 3px rgba(0,0,0,.15);-webkit-box-shadow:0 0 3px rgba(0,0,0,.15);box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #b6b6b6;padding:6px 8px 2px;white-space:normal;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#cfd1cf));background-image:-moz-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-webkit-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-o-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-ms-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:linear-gradient(top,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_float .cke_top{border:1px solid #b6b6b6;border-bottom-color:#999}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #bfbfbf;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#ebebeb),to(#cfd1cf));background-image:-moz-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-webkit-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-o-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-ms-linear-gradient(top,#ebebeb,#cfd1cf);background-image:linear-gradient(top,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.3);-webkit-box-shadow:0 1px 0 rgba(255,255,255,.3);box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 0 3px rgba(0,0,0,.15);-webkit-box-shadow:0 0 3px rgba(0,0,0,.15);box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2;-moz-box-shadow:0 0 2px rgba(0,0,0,.1) inset;-webkit-box-shadow:0 0 2px rgba(0,0,0,.1) inset;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2;-moz-box-shadow:0 0 2px rgba(0,0,0,.1) inset;-webkit-box-shadow:0 0 2px rgba(0,0,0,.1) inset;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;-moz-border-radius:2px 2px 0 0;-webkit-border-radius:2px 2px 0 0;border-radius:2px 2px 0 0;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#cfd1cf));background-image:-moz-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-webkit-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-o-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-ms-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:linear-gradient(top,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e4e4e4));background-image:-moz-linear-gradient(top,#fff,#e4e4e4);background-image:-webkit-linear-gradient(top,#fff,#e4e4e4);background-image:-o-linear-gradient(top,#fff,#e4e4e4);background-image:-ms-linear-gradient(top,#fff,#e4e4e4);background-image:linear-gradient(top,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup *:first-child{-moz-border-radius:0 2px 2px 0;-webkit-border-radius:0 2px 2px 0;border-radius:0 2px 2px 0}.cke_rtl .cke_toolgroup *:last-child{-moz-border-radius:2px 0 0 2px;-webkit-border-radius:2px 0 0 2px;border-radius:2px 0 0 2px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}.cke_button_on{-moz-box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);-webkit-box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);background:#b5b5b5;background-image:-webkit-gradient(linear,left top,left bottom,from(#aaa),to(#cacaca));background-image:-moz-linear-gradient(top,#aaa,#cacaca);background-image:-webkit-linear-gradient(top,#aaa,#cacaca);background-image:-o-linear-gradient(top,#aaa,#cacaca);background-image:-ms-linear-gradient(top,#aaa,#cacaca);background-image:linear-gradient(top,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{-moz-box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2);-webkit-box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2);box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{-moz-box-shadow:0 0 1px rgba(0,0,0,.3) inset;-webkit-box-shadow:0 0 1px rgba(0,0,0,.3) inset;box-shadow:0 0 1px rgba(0,0,0,.3) inset;background:#ccc;background-image:-webkit-gradient(linear,left top,left bottom,from(#f2f2f2),to(#ccc));background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:-ms-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(top,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;-webkit-box-shadow:1px 0 1px rgba(255,255,255,.5);-moz-box-shadow:1px 0 1px rgba(255,255,255,.5);box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;-webkit-box-shadow:-1px 0 1px rgba(255,255,255,.1);-moz-box-shadow:-1px 0 1px rgba(255,255,255,.1);box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e4e4e4));background-image:-moz-linear-gradient(top,#fff,#e4e4e4);background-image:-webkit-linear-gradient(top,#fff,#e4e4e4);background-image:-o-linear-gradient(top,#fff,#e4e4e4);background-image:-ms-linear-gradient(top,#fff,#e4e4e4);background-image:linear-gradient(top,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_toolbox_collapser:hover{background:#ccc;background-image:-webkit-gradient(linear,left top,left bottom,from(#f2f2f2),to(#ccc));background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:-ms-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(top,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;-moz-box-shadow:0 0 2px rgba(0,0,0,.1) inset;-webkit-box-shadow:0 0 2px rgba(0,0,0,.1) inset;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_button{display:inline-block;float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e4e4e4));background-image:-moz-linear-gradient(top,#fff,#e4e4e4);background-image:-webkit-linear-gradient(top,#fff,#e4e4e4);background-image:-o-linear-gradient(top,#fff,#e4e4e4);background-image:-ms-linear-gradient(top,#fff,#e4e4e4);background-image:linear-gradient(top,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ccc;background-image:-webkit-gradient(linear,left top,left bottom,from(#f2f2f2),to(#ccc));background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:-ms-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(top,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc');outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{border:1px solid #777;-moz-box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;background:#b5b5b5;background-image:-webkit-gradient(linear,left top,left bottom,from(#aaa),to(#cacaca));background-image:-moz-linear-gradient(top,#aaa,#cacaca);background-image:-webkit-linear-gradient(top,#aaa,#cacaca);background-image:-o-linear-gradient(top,#aaa,#cacaca);background-image:-ms-linear-gradient(top,#aaa,#cacaca);background-image:linear-gradient(top,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{-moz-box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2);-webkit-box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2);box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}.cke_path_item,.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5);-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px;-moz-box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5);-webkit-box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5);box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_bottom{padding-bottom:3px}.cke_combo_text{margin-bottom:-1px;margin-top:1px}.cke_button__about_icon {background: url(icons.png) no-repeat 0 -0px !important;}.cke_button__bold_icon {background: url(icons.png) no-repeat 0 -24px !important;}.cke_button__italic_icon {background: url(icons.png) no-repeat 0 -48px !important;}.cke_button__strike_icon {background: url(icons.png) no-repeat 0 -72px !important;}.cke_button__subscript_icon {background: url(icons.png) no-repeat 0 -96px !important;}.cke_button__superscript_icon {background: url(icons.png) no-repeat 0 -120px !important;}.cke_button__underline_icon {background: url(icons.png) no-repeat 0 -144px !important;}.cke_button__blockquote_icon {background: url(icons.png) no-repeat 0 -168px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png) no-repeat 0 -192px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png) no-repeat 0 -216px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png) no-repeat 0 -240px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png) no-repeat 0 -264px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png) no-repeat 0 -288px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png) no-repeat 0 -312px !important;}.cke_button__horizontalrule_icon {background: url(icons.png) no-repeat 0 -336px !important;}.cke_button__image_icon {background: url(icons.png) no-repeat 0 -360px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png) no-repeat 0 -384px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png) no-repeat 0 -408px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png) no-repeat 0 -432px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png) no-repeat 0 -456px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png) no-repeat 0 -480px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png) no-repeat 0 -504px !important;}.cke_button__link_icon {background: url(icons.png) no-repeat 0 -528px !important;}.cke_button__unlink_icon {background: url(icons.png) no-repeat 0 -552px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png) no-repeat 0 -576px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png) no-repeat 0 -600px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png) no-repeat 0 -624px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png) no-repeat 0 -648px !important;}.cke_button__maximize_icon {background: url(icons.png) no-repeat 0 -672px !important;}.cke_rtl .cke_button__pastetext_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons.png) no-repeat 0 -696px !important;}.cke_ltr .cke_button__pastetext_icon {background: url(icons.png) no-repeat 0 -720px !important;}.cke_rtl .cke_button__pastefromword_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons.png) no-repeat 0 -744px !important;}.cke_ltr .cke_button__pastefromword_icon {background: url(icons.png) no-repeat 0 -768px !important;}.cke_button__removeformat_icon {background: url(icons.png) no-repeat 0 -792px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png) no-repeat 0 -816px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png) no-repeat 0 -840px !important;}.cke_button__specialchar_icon {background: url(icons.png) no-repeat 0 -864px !important;}.cke_button__scayt_icon {background: url(icons.png) no-repeat 0 -888px !important;}.cke_button__table_icon {background: url(icons.png) no-repeat 0 -912px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png) no-repeat 0 -936px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png) no-repeat 0 -960px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png) no-repeat 0 -984px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png) no-repeat 0 -1008px !important;}.cke_button__spellchecker_icon {background: url(icons.png) no-repeat 0 -1032px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastetext_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons_hidpi.png) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon {background: url(icons_hidpi.png) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons_hidpi.png) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon {background: url(icons_hidpi.png) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_hidpi .cke_button__specialchar_icon {background: url(icons_hidpi.png) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_hidpi .cke_button__scayt_icon {background: url(icons_hidpi.png) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png) no-repeat 0 -960px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png) no-repeat 0 -984px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png) no-repeat 0 -1008px !important;background-size: 16px !important;}.cke_hidpi .cke_button__spellchecker_icon {background: url(icons_hidpi.png) no-repeat 0 -1032px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/public/assets/plugins/ckeditor/skins/moono/editor_ie.css b/public/assets/plugins/ckeditor/skins/moono/editor_ie.css
new file mode 100644
index 00000000..332d7795
--- /dev/null
+++ b/public/assets/plugins/ckeditor/skins/moono/editor_ie.css
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;position:static;-webkit-transition:none;-moz-transition:none;-ms-transition:none;transition:none}.cke_reset_all,.cke_reset_all *{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;position:static;-webkit-transition:none;-moz-transition:none;-ms-transition:none;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box}.cke_chrome{display:block;border:1px solid #b6b6b6;padding:0;-moz-box-shadow:0 0 3px rgba(0,0,0,.15);-webkit-box-shadow:0 0 3px rgba(0,0,0,.15);box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #b6b6b6;padding:6px 8px 2px;white-space:normal;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#cfd1cf));background-image:-moz-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-webkit-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-o-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-ms-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:linear-gradient(top,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_float .cke_top{border:1px solid #b6b6b6;border-bottom-color:#999}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #bfbfbf;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#ebebeb),to(#cfd1cf));background-image:-moz-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-webkit-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-o-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-ms-linear-gradient(top,#ebebeb,#cfd1cf);background-image:linear-gradient(top,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.3);-webkit-box-shadow:0 1px 0 rgba(255,255,255,.3);box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 0 3px rgba(0,0,0,.15);-webkit-box-shadow:0 0 3px rgba(0,0,0,.15);box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2;-moz-box-shadow:0 0 2px rgba(0,0,0,.1) inset;-webkit-box-shadow:0 0 2px rgba(0,0,0,.1) inset;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2;-moz-box-shadow:0 0 2px rgba(0,0,0,.1) inset;-webkit-box-shadow:0 0 2px rgba(0,0,0,.1) inset;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;-moz-border-radius:2px 2px 0 0;-webkit-border-radius:2px 2px 0 0;border-radius:2px 2px 0 0;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#cfd1cf));background-image:-moz-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-webkit-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-o-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-ms-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:linear-gradient(top,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e4e4e4));background-image:-moz-linear-gradient(top,#fff,#e4e4e4);background-image:-webkit-linear-gradient(top,#fff,#e4e4e4);background-image:-o-linear-gradient(top,#fff,#e4e4e4);background-image:-ms-linear-gradient(top,#fff,#e4e4e4);background-image:linear-gradient(top,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup *:first-child{-moz-border-radius:0 2px 2px 0;-webkit-border-radius:0 2px 2px 0;border-radius:0 2px 2px 0}.cke_rtl .cke_toolgroup *:last-child{-moz-border-radius:2px 0 0 2px;-webkit-border-radius:2px 0 0 2px;border-radius:2px 0 0 2px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}.cke_button_on{-moz-box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);-webkit-box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);background:#b5b5b5;background-image:-webkit-gradient(linear,left top,left bottom,from(#aaa),to(#cacaca));background-image:-moz-linear-gradient(top,#aaa,#cacaca);background-image:-webkit-linear-gradient(top,#aaa,#cacaca);background-image:-o-linear-gradient(top,#aaa,#cacaca);background-image:-ms-linear-gradient(top,#aaa,#cacaca);background-image:linear-gradient(top,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{-moz-box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2);-webkit-box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2);box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{-moz-box-shadow:0 0 1px rgba(0,0,0,.3) inset;-webkit-box-shadow:0 0 1px rgba(0,0,0,.3) inset;box-shadow:0 0 1px rgba(0,0,0,.3) inset;background:#ccc;background-image:-webkit-gradient(linear,left top,left bottom,from(#f2f2f2),to(#ccc));background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:-ms-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(top,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;-webkit-box-shadow:1px 0 1px rgba(255,255,255,.5);-moz-box-shadow:1px 0 1px rgba(255,255,255,.5);box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;-webkit-box-shadow:-1px 0 1px rgba(255,255,255,.1);-moz-box-shadow:-1px 0 1px rgba(255,255,255,.1);box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e4e4e4));background-image:-moz-linear-gradient(top,#fff,#e4e4e4);background-image:-webkit-linear-gradient(top,#fff,#e4e4e4);background-image:-o-linear-gradient(top,#fff,#e4e4e4);background-image:-ms-linear-gradient(top,#fff,#e4e4e4);background-image:linear-gradient(top,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_toolbox_collapser:hover{background:#ccc;background-image:-webkit-gradient(linear,left top,left bottom,from(#f2f2f2),to(#ccc));background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:-ms-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(top,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;-moz-box-shadow:0 0 2px rgba(0,0,0,.1) inset;-webkit-box-shadow:0 0 2px rgba(0,0,0,.1) inset;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_button{display:inline-block;float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e4e4e4));background-image:-moz-linear-gradient(top,#fff,#e4e4e4);background-image:-webkit-linear-gradient(top,#fff,#e4e4e4);background-image:-o-linear-gradient(top,#fff,#e4e4e4);background-image:-ms-linear-gradient(top,#fff,#e4e4e4);background-image:linear-gradient(top,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ccc;background-image:-webkit-gradient(linear,left top,left bottom,from(#f2f2f2),to(#ccc));background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:-ms-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(top,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc');outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{border:1px solid #777;-moz-box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;background:#b5b5b5;background-image:-webkit-gradient(linear,left top,left bottom,from(#aaa),to(#cacaca));background-image:-moz-linear-gradient(top,#aaa,#cacaca);background-image:-webkit-linear-gradient(top,#aaa,#cacaca);background-image:-o-linear-gradient(top,#aaa,#cacaca);background-image:-ms-linear-gradient(top,#aaa,#cacaca);background-image:linear-gradient(top,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{-moz-box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2);-webkit-box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2);box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}.cke_path_item,.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5);-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px;-moz-box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5);-webkit-box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5);box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_button__about_icon {background: url(icons.png) no-repeat 0 -0px !important;}.cke_button__bold_icon {background: url(icons.png) no-repeat 0 -24px !important;}.cke_button__italic_icon {background: url(icons.png) no-repeat 0 -48px !important;}.cke_button__strike_icon {background: url(icons.png) no-repeat 0 -72px !important;}.cke_button__subscript_icon {background: url(icons.png) no-repeat 0 -96px !important;}.cke_button__superscript_icon {background: url(icons.png) no-repeat 0 -120px !important;}.cke_button__underline_icon {background: url(icons.png) no-repeat 0 -144px !important;}.cke_button__blockquote_icon {background: url(icons.png) no-repeat 0 -168px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png) no-repeat 0 -192px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png) no-repeat 0 -216px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png) no-repeat 0 -240px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png) no-repeat 0 -264px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png) no-repeat 0 -288px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png) no-repeat 0 -312px !important;}.cke_button__horizontalrule_icon {background: url(icons.png) no-repeat 0 -336px !important;}.cke_button__image_icon {background: url(icons.png) no-repeat 0 -360px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png) no-repeat 0 -384px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png) no-repeat 0 -408px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png) no-repeat 0 -432px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png) no-repeat 0 -456px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png) no-repeat 0 -480px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png) no-repeat 0 -504px !important;}.cke_button__link_icon {background: url(icons.png) no-repeat 0 -528px !important;}.cke_button__unlink_icon {background: url(icons.png) no-repeat 0 -552px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png) no-repeat 0 -576px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png) no-repeat 0 -600px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png) no-repeat 0 -624px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png) no-repeat 0 -648px !important;}.cke_button__maximize_icon {background: url(icons.png) no-repeat 0 -672px !important;}.cke_rtl .cke_button__pastetext_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons.png) no-repeat 0 -696px !important;}.cke_ltr .cke_button__pastetext_icon {background: url(icons.png) no-repeat 0 -720px !important;}.cke_rtl .cke_button__pastefromword_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons.png) no-repeat 0 -744px !important;}.cke_ltr .cke_button__pastefromword_icon {background: url(icons.png) no-repeat 0 -768px !important;}.cke_button__removeformat_icon {background: url(icons.png) no-repeat 0 -792px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png) no-repeat 0 -816px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png) no-repeat 0 -840px !important;}.cke_button__specialchar_icon {background: url(icons.png) no-repeat 0 -864px !important;}.cke_button__scayt_icon {background: url(icons.png) no-repeat 0 -888px !important;}.cke_button__table_icon {background: url(icons.png) no-repeat 0 -912px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png) no-repeat 0 -936px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png) no-repeat 0 -960px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png) no-repeat 0 -984px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png) no-repeat 0 -1008px !important;}.cke_button__spellchecker_icon {background: url(icons.png) no-repeat 0 -1032px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastetext_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons_hidpi.png) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon {background: url(icons_hidpi.png) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons_hidpi.png) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon {background: url(icons_hidpi.png) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_hidpi .cke_button__specialchar_icon {background: url(icons_hidpi.png) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_hidpi .cke_button__scayt_icon {background: url(icons_hidpi.png) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png) no-repeat 0 -960px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png) no-repeat 0 -984px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png) no-repeat 0 -1008px !important;background-size: 16px !important;}.cke_hidpi .cke_button__spellchecker_icon {background: url(icons_hidpi.png) no-repeat 0 -1032px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/public/assets/plugins/ckeditor/skins/moono/editor_ie7.css b/public/assets/plugins/ckeditor/skins/moono/editor_ie7.css
new file mode 100644
index 00000000..9bfeaa78
--- /dev/null
+++ b/public/assets/plugins/ckeditor/skins/moono/editor_ie7.css
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;position:static;-webkit-transition:none;-moz-transition:none;-ms-transition:none;transition:none}.cke_reset_all,.cke_reset_all *{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;position:static;-webkit-transition:none;-moz-transition:none;-ms-transition:none;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box}.cke_chrome{display:block;border:1px solid #b6b6b6;padding:0;-moz-box-shadow:0 0 3px rgba(0,0,0,.15);-webkit-box-shadow:0 0 3px rgba(0,0,0,.15);box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #b6b6b6;padding:6px 8px 2px;white-space:normal;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#cfd1cf));background-image:-moz-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-webkit-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-o-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-ms-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:linear-gradient(top,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_float .cke_top{border:1px solid #b6b6b6;border-bottom-color:#999}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #bfbfbf;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#ebebeb),to(#cfd1cf));background-image:-moz-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-webkit-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-o-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-ms-linear-gradient(top,#ebebeb,#cfd1cf);background-image:linear-gradient(top,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.3);-webkit-box-shadow:0 1px 0 rgba(255,255,255,.3);box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 0 3px rgba(0,0,0,.15);-webkit-box-shadow:0 0 3px rgba(0,0,0,.15);box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2;-moz-box-shadow:0 0 2px rgba(0,0,0,.1) inset;-webkit-box-shadow:0 0 2px rgba(0,0,0,.1) inset;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2;-moz-box-shadow:0 0 2px rgba(0,0,0,.1) inset;-webkit-box-shadow:0 0 2px rgba(0,0,0,.1) inset;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;-moz-border-radius:2px 2px 0 0;-webkit-border-radius:2px 2px 0 0;border-radius:2px 2px 0 0;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#cfd1cf));background-image:-moz-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-webkit-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-o-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-ms-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:linear-gradient(top,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e4e4e4));background-image:-moz-linear-gradient(top,#fff,#e4e4e4);background-image:-webkit-linear-gradient(top,#fff,#e4e4e4);background-image:-o-linear-gradient(top,#fff,#e4e4e4);background-image:-ms-linear-gradient(top,#fff,#e4e4e4);background-image:linear-gradient(top,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup *:first-child{-moz-border-radius:0 2px 2px 0;-webkit-border-radius:0 2px 2px 0;border-radius:0 2px 2px 0}.cke_rtl .cke_toolgroup *:last-child{-moz-border-radius:2px 0 0 2px;-webkit-border-radius:2px 0 0 2px;border-radius:2px 0 0 2px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}.cke_button_on{-moz-box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);-webkit-box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);background:#b5b5b5;background-image:-webkit-gradient(linear,left top,left bottom,from(#aaa),to(#cacaca));background-image:-moz-linear-gradient(top,#aaa,#cacaca);background-image:-webkit-linear-gradient(top,#aaa,#cacaca);background-image:-o-linear-gradient(top,#aaa,#cacaca);background-image:-ms-linear-gradient(top,#aaa,#cacaca);background-image:linear-gradient(top,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{-moz-box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2);-webkit-box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2);box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{-moz-box-shadow:0 0 1px rgba(0,0,0,.3) inset;-webkit-box-shadow:0 0 1px rgba(0,0,0,.3) inset;box-shadow:0 0 1px rgba(0,0,0,.3) inset;background:#ccc;background-image:-webkit-gradient(linear,left top,left bottom,from(#f2f2f2),to(#ccc));background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:-ms-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(top,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;-webkit-box-shadow:1px 0 1px rgba(255,255,255,.5);-moz-box-shadow:1px 0 1px rgba(255,255,255,.5);box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;-webkit-box-shadow:-1px 0 1px rgba(255,255,255,.1);-moz-box-shadow:-1px 0 1px rgba(255,255,255,.1);box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e4e4e4));background-image:-moz-linear-gradient(top,#fff,#e4e4e4);background-image:-webkit-linear-gradient(top,#fff,#e4e4e4);background-image:-o-linear-gradient(top,#fff,#e4e4e4);background-image:-ms-linear-gradient(top,#fff,#e4e4e4);background-image:linear-gradient(top,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_toolbox_collapser:hover{background:#ccc;background-image:-webkit-gradient(linear,left top,left bottom,from(#f2f2f2),to(#ccc));background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:-ms-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(top,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;-moz-box-shadow:0 0 2px rgba(0,0,0,.1) inset;-webkit-box-shadow:0 0 2px rgba(0,0,0,.1) inset;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_button{display:inline-block;float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e4e4e4));background-image:-moz-linear-gradient(top,#fff,#e4e4e4);background-image:-webkit-linear-gradient(top,#fff,#e4e4e4);background-image:-o-linear-gradient(top,#fff,#e4e4e4);background-image:-ms-linear-gradient(top,#fff,#e4e4e4);background-image:linear-gradient(top,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ccc;background-image:-webkit-gradient(linear,left top,left bottom,from(#f2f2f2),to(#ccc));background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:-ms-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(top,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc');outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{border:1px solid #777;-moz-box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;background:#b5b5b5;background-image:-webkit-gradient(linear,left top,left bottom,from(#aaa),to(#cacaca));background-image:-moz-linear-gradient(top,#aaa,#cacaca);background-image:-webkit-linear-gradient(top,#aaa,#cacaca);background-image:-o-linear-gradient(top,#aaa,#cacaca);background-image:-ms-linear-gradient(top,#aaa,#cacaca);background-image:linear-gradient(top,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{-moz-box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2);-webkit-box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2);box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}.cke_path_item,.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5);-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px;-moz-box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5);-webkit-box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5);box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_button,.cke_rtl .cke_button *,.cke_rtl .cke_combo,.cke_rtl .cke_combo *,.cke_rtl .cke_path_item,.cke_rtl .cke_path_item *,.cke_rtl .cke_path_empty{float:none}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_combo_button,.cke_rtl .cke_combo_button *,.cke_rtl .cke_button,.cke_rtl .cke_button_icon,{display:inline-block;vertical-align:top}.cke_toolbox{display:inline-block;padding-bottom:5px;height:100%}.cke_rtl .cke_toolbox{padding-bottom:0}.cke_toolbar{margin-bottom:5px}.cke_rtl .cke_toolbar{margin-bottom:0}.cke_toolgroup{height:26px}.cke_toolgroup,.cke_combo{position:relative}a.cke_button{float:none;vertical-align:top}.cke_toolbar_separator{display:inline-block;float:none;vertical-align:top;background-color:#c0c0c0}.cke_toolbox_collapser .cke_arrow{margin-top:0}.cke_toolbox_collapser .cke_arrow{border-width:4px}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{border-width:3px}.cke_rtl .cke_button_arrow{padding-top:8px;margin-right:2px}.cke_rtl .cke_combo_inlinelabel{display:table-cell;vertical-align:middle}.cke_menubutton{display:block;height:24px}.cke_menubutton_inner{display:block;position:relative}.cke_menubutton_icon{height:16px;width:16px}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:inline-block}.cke_menubutton_label{width:auto;vertical-align:top;line-height:24px;height:24px;margin:0 10px 0 0}.cke_menuarrow{width:5px;height:6px;padding:0;position:absolute;right:8px;top:10px;background-position:0 0}.cke_rtl .cke_menubutton_icon{position:absolute;right:0;top:0}.cke_rtl .cke_menubutton_label{float:right;clear:both;margin:0 24px 0 10px}.cke_hc .cke_rtl .cke_menubutton_label{margin-right:0}.cke_rtl .cke_menuarrow{left:8px;right:auto;background-position:0 -24px}.cke_hc .cke_menuarrow{top:5px;padding:0 5px}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{position:relative}.cke_wysiwyg_div{padding-top:0!important;padding-bottom:0!important}.cke_button__about_icon {background: url(icons.png) no-repeat 0 -0px !important;}.cke_button__bold_icon {background: url(icons.png) no-repeat 0 -24px !important;}.cke_button__italic_icon {background: url(icons.png) no-repeat 0 -48px !important;}.cke_button__strike_icon {background: url(icons.png) no-repeat 0 -72px !important;}.cke_button__subscript_icon {background: url(icons.png) no-repeat 0 -96px !important;}.cke_button__superscript_icon {background: url(icons.png) no-repeat 0 -120px !important;}.cke_button__underline_icon {background: url(icons.png) no-repeat 0 -144px !important;}.cke_button__blockquote_icon {background: url(icons.png) no-repeat 0 -168px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png) no-repeat 0 -192px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png) no-repeat 0 -216px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png) no-repeat 0 -240px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png) no-repeat 0 -264px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png) no-repeat 0 -288px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png) no-repeat 0 -312px !important;}.cke_button__horizontalrule_icon {background: url(icons.png) no-repeat 0 -336px !important;}.cke_button__image_icon {background: url(icons.png) no-repeat 0 -360px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png) no-repeat 0 -384px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png) no-repeat 0 -408px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png) no-repeat 0 -432px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png) no-repeat 0 -456px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png) no-repeat 0 -480px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png) no-repeat 0 -504px !important;}.cke_button__link_icon {background: url(icons.png) no-repeat 0 -528px !important;}.cke_button__unlink_icon {background: url(icons.png) no-repeat 0 -552px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png) no-repeat 0 -576px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png) no-repeat 0 -600px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png) no-repeat 0 -624px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png) no-repeat 0 -648px !important;}.cke_button__maximize_icon {background: url(icons.png) no-repeat 0 -672px !important;}.cke_rtl .cke_button__pastetext_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons.png) no-repeat 0 -696px !important;}.cke_ltr .cke_button__pastetext_icon {background: url(icons.png) no-repeat 0 -720px !important;}.cke_rtl .cke_button__pastefromword_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons.png) no-repeat 0 -744px !important;}.cke_ltr .cke_button__pastefromword_icon {background: url(icons.png) no-repeat 0 -768px !important;}.cke_button__removeformat_icon {background: url(icons.png) no-repeat 0 -792px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png) no-repeat 0 -816px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png) no-repeat 0 -840px !important;}.cke_button__specialchar_icon {background: url(icons.png) no-repeat 0 -864px !important;}.cke_button__scayt_icon {background: url(icons.png) no-repeat 0 -888px !important;}.cke_button__table_icon {background: url(icons.png) no-repeat 0 -912px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png) no-repeat 0 -936px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png) no-repeat 0 -960px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png) no-repeat 0 -984px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png) no-repeat 0 -1008px !important;}.cke_button__spellchecker_icon {background: url(icons.png) no-repeat 0 -1032px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastetext_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons_hidpi.png) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon {background: url(icons_hidpi.png) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons_hidpi.png) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon {background: url(icons_hidpi.png) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_hidpi .cke_button__specialchar_icon {background: url(icons_hidpi.png) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_hidpi .cke_button__scayt_icon {background: url(icons_hidpi.png) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png) no-repeat 0 -960px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png) no-repeat 0 -984px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png) no-repeat 0 -1008px !important;background-size: 16px !important;}.cke_hidpi .cke_button__spellchecker_icon {background: url(icons_hidpi.png) no-repeat 0 -1032px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/public/assets/plugins/ckeditor/skins/moono/editor_ie8.css b/public/assets/plugins/ckeditor/skins/moono/editor_ie8.css
new file mode 100644
index 00000000..955ec8d2
--- /dev/null
+++ b/public/assets/plugins/ckeditor/skins/moono/editor_ie8.css
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;position:static;-webkit-transition:none;-moz-transition:none;-ms-transition:none;transition:none}.cke_reset_all,.cke_reset_all *{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;position:static;-webkit-transition:none;-moz-transition:none;-ms-transition:none;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box}.cke_chrome{display:block;border:1px solid #b6b6b6;padding:0;-moz-box-shadow:0 0 3px rgba(0,0,0,.15);-webkit-box-shadow:0 0 3px rgba(0,0,0,.15);box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #b6b6b6;padding:6px 8px 2px;white-space:normal;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#cfd1cf));background-image:-moz-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-webkit-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-o-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-ms-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:linear-gradient(top,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_float .cke_top{border:1px solid #b6b6b6;border-bottom-color:#999}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #bfbfbf;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#ebebeb),to(#cfd1cf));background-image:-moz-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-webkit-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-o-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-ms-linear-gradient(top,#ebebeb,#cfd1cf);background-image:linear-gradient(top,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.3);-webkit-box-shadow:0 1px 0 rgba(255,255,255,.3);box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 0 3px rgba(0,0,0,.15);-webkit-box-shadow:0 0 3px rgba(0,0,0,.15);box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2;-moz-box-shadow:0 0 2px rgba(0,0,0,.1) inset;-webkit-box-shadow:0 0 2px rgba(0,0,0,.1) inset;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2;-moz-box-shadow:0 0 2px rgba(0,0,0,.1) inset;-webkit-box-shadow:0 0 2px rgba(0,0,0,.1) inset;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;-moz-border-radius:2px 2px 0 0;-webkit-border-radius:2px 2px 0 0;border-radius:2px 2px 0 0;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#cfd1cf));background-image:-moz-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-webkit-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-o-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-ms-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:linear-gradient(top,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e4e4e4));background-image:-moz-linear-gradient(top,#fff,#e4e4e4);background-image:-webkit-linear-gradient(top,#fff,#e4e4e4);background-image:-o-linear-gradient(top,#fff,#e4e4e4);background-image:-ms-linear-gradient(top,#fff,#e4e4e4);background-image:linear-gradient(top,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup *:first-child{-moz-border-radius:0 2px 2px 0;-webkit-border-radius:0 2px 2px 0;border-radius:0 2px 2px 0}.cke_rtl .cke_toolgroup *:last-child{-moz-border-radius:2px 0 0 2px;-webkit-border-radius:2px 0 0 2px;border-radius:2px 0 0 2px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}.cke_button_on{-moz-box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);-webkit-box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);background:#b5b5b5;background-image:-webkit-gradient(linear,left top,left bottom,from(#aaa),to(#cacaca));background-image:-moz-linear-gradient(top,#aaa,#cacaca);background-image:-webkit-linear-gradient(top,#aaa,#cacaca);background-image:-o-linear-gradient(top,#aaa,#cacaca);background-image:-ms-linear-gradient(top,#aaa,#cacaca);background-image:linear-gradient(top,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{-moz-box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2);-webkit-box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2);box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{-moz-box-shadow:0 0 1px rgba(0,0,0,.3) inset;-webkit-box-shadow:0 0 1px rgba(0,0,0,.3) inset;box-shadow:0 0 1px rgba(0,0,0,.3) inset;background:#ccc;background-image:-webkit-gradient(linear,left top,left bottom,from(#f2f2f2),to(#ccc));background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:-ms-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(top,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;-webkit-box-shadow:1px 0 1px rgba(255,255,255,.5);-moz-box-shadow:1px 0 1px rgba(255,255,255,.5);box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;-webkit-box-shadow:-1px 0 1px rgba(255,255,255,.1);-moz-box-shadow:-1px 0 1px rgba(255,255,255,.1);box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e4e4e4));background-image:-moz-linear-gradient(top,#fff,#e4e4e4);background-image:-webkit-linear-gradient(top,#fff,#e4e4e4);background-image:-o-linear-gradient(top,#fff,#e4e4e4);background-image:-ms-linear-gradient(top,#fff,#e4e4e4);background-image:linear-gradient(top,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_toolbox_collapser:hover{background:#ccc;background-image:-webkit-gradient(linear,left top,left bottom,from(#f2f2f2),to(#ccc));background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:-ms-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(top,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;-moz-box-shadow:0 0 2px rgba(0,0,0,.1) inset;-webkit-box-shadow:0 0 2px rgba(0,0,0,.1) inset;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_button{display:inline-block;float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e4e4e4));background-image:-moz-linear-gradient(top,#fff,#e4e4e4);background-image:-webkit-linear-gradient(top,#fff,#e4e4e4);background-image:-o-linear-gradient(top,#fff,#e4e4e4);background-image:-ms-linear-gradient(top,#fff,#e4e4e4);background-image:linear-gradient(top,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ccc;background-image:-webkit-gradient(linear,left top,left bottom,from(#f2f2f2),to(#ccc));background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:-ms-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(top,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc');outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{border:1px solid #777;-moz-box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;background:#b5b5b5;background-image:-webkit-gradient(linear,left top,left bottom,from(#aaa),to(#cacaca));background-image:-moz-linear-gradient(top,#aaa,#cacaca);background-image:-webkit-linear-gradient(top,#aaa,#cacaca);background-image:-o-linear-gradient(top,#aaa,#cacaca);background-image:-ms-linear-gradient(top,#aaa,#cacaca);background-image:linear-gradient(top,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{-moz-box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2);-webkit-box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2);box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}.cke_path_item,.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5);-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px;-moz-box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5);-webkit-box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5);box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_toolbox_collapser .cke_arrow{border-width:4px}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{border-width:3px}.cke_toolbox_collapser .cke_arrow{margin-top:0}.cke_button__about_icon {background: url(icons.png) no-repeat 0 -0px !important;}.cke_button__bold_icon {background: url(icons.png) no-repeat 0 -24px !important;}.cke_button__italic_icon {background: url(icons.png) no-repeat 0 -48px !important;}.cke_button__strike_icon {background: url(icons.png) no-repeat 0 -72px !important;}.cke_button__subscript_icon {background: url(icons.png) no-repeat 0 -96px !important;}.cke_button__superscript_icon {background: url(icons.png) no-repeat 0 -120px !important;}.cke_button__underline_icon {background: url(icons.png) no-repeat 0 -144px !important;}.cke_button__blockquote_icon {background: url(icons.png) no-repeat 0 -168px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png) no-repeat 0 -192px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png) no-repeat 0 -216px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png) no-repeat 0 -240px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png) no-repeat 0 -264px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png) no-repeat 0 -288px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png) no-repeat 0 -312px !important;}.cke_button__horizontalrule_icon {background: url(icons.png) no-repeat 0 -336px !important;}.cke_button__image_icon {background: url(icons.png) no-repeat 0 -360px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png) no-repeat 0 -384px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png) no-repeat 0 -408px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png) no-repeat 0 -432px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png) no-repeat 0 -456px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png) no-repeat 0 -480px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png) no-repeat 0 -504px !important;}.cke_button__link_icon {background: url(icons.png) no-repeat 0 -528px !important;}.cke_button__unlink_icon {background: url(icons.png) no-repeat 0 -552px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png) no-repeat 0 -576px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png) no-repeat 0 -600px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png) no-repeat 0 -624px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png) no-repeat 0 -648px !important;}.cke_button__maximize_icon {background: url(icons.png) no-repeat 0 -672px !important;}.cke_rtl .cke_button__pastetext_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons.png) no-repeat 0 -696px !important;}.cke_ltr .cke_button__pastetext_icon {background: url(icons.png) no-repeat 0 -720px !important;}.cke_rtl .cke_button__pastefromword_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons.png) no-repeat 0 -744px !important;}.cke_ltr .cke_button__pastefromword_icon {background: url(icons.png) no-repeat 0 -768px !important;}.cke_button__removeformat_icon {background: url(icons.png) no-repeat 0 -792px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png) no-repeat 0 -816px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png) no-repeat 0 -840px !important;}.cke_button__specialchar_icon {background: url(icons.png) no-repeat 0 -864px !important;}.cke_button__scayt_icon {background: url(icons.png) no-repeat 0 -888px !important;}.cke_button__table_icon {background: url(icons.png) no-repeat 0 -912px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png) no-repeat 0 -936px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png) no-repeat 0 -960px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png) no-repeat 0 -984px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png) no-repeat 0 -1008px !important;}.cke_button__spellchecker_icon {background: url(icons.png) no-repeat 0 -1032px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastetext_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons_hidpi.png) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon {background: url(icons_hidpi.png) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons_hidpi.png) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon {background: url(icons_hidpi.png) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_hidpi .cke_button__specialchar_icon {background: url(icons_hidpi.png) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_hidpi .cke_button__scayt_icon {background: url(icons_hidpi.png) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png) no-repeat 0 -960px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png) no-repeat 0 -984px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png) no-repeat 0 -1008px !important;background-size: 16px !important;}.cke_hidpi .cke_button__spellchecker_icon {background: url(icons_hidpi.png) no-repeat 0 -1032px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/public/assets/plugins/ckeditor/skins/moono/editor_iequirks.css b/public/assets/plugins/ckeditor/skins/moono/editor_iequirks.css
new file mode 100644
index 00000000..009d08c5
--- /dev/null
+++ b/public/assets/plugins/ckeditor/skins/moono/editor_iequirks.css
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.md or http://ckeditor.com/license
+*/
+.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;position:static;-webkit-transition:none;-moz-transition:none;-ms-transition:none;transition:none}.cke_reset_all,.cke_reset_all *{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;position:static;-webkit-transition:none;-moz-transition:none;-ms-transition:none;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box}.cke_chrome{display:block;border:1px solid #b6b6b6;padding:0;-moz-box-shadow:0 0 3px rgba(0,0,0,.15);-webkit-box-shadow:0 0 3px rgba(0,0,0,.15);box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_inner{display:block;-webkit-touch-callout:none;background:#fff;padding:0}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #b6b6b6;padding:6px 8px 2px;white-space:normal;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#cfd1cf));background-image:-moz-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-webkit-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-o-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-ms-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:linear-gradient(top,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_float .cke_top{border:1px solid #b6b6b6;border-bottom-color:#999}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #bfbfbf;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#ebebeb),to(#cfd1cf));background-image:-moz-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-webkit-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-o-linear-gradient(top,#ebebeb,#cfd1cf);background-image:-ms-linear-gradient(top,#ebebeb,#cfd1cf);background-image:linear-gradient(top,#ebebeb,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ebebeb',endColorstr='#cfd1cf')}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #666 transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.3);-webkit-box-shadow:0 1px 0 rgba(255,255,255,.3);box-shadow:0 1px 0 rgba(255,255,255,.3)}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #a5a5a5;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #b6b6b6;border-bottom-color:#999;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 0 3px rgba(0,0,0,.15);-webkit-box-shadow:0 0 3px rgba(0,0,0,.15);box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_list{list-style-type:none;margin:3px;padding:0;white-space:nowrap}.cke_panel_listItem{margin:0;padding-bottom:1px}.cke_panel_listItem a{padding:3px 4px;display:block;border:1px solid #fff;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis;-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px}* html .cke_panel_listItem a{width:100%;color:#000}*:first-child+html .cke_panel_listItem a{color:#000}.cke_panel_listItem.cke_selected a{border:1px solid #dedede;background-color:#f2f2f2;-moz-box-shadow:0 0 2px rgba(0,0,0,.1) inset;-webkit-box-shadow:0 0 2px rgba(0,0,0,.1) inset;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{border-color:#dedede;background-color:#f2f2f2;-moz-box-shadow:0 0 2px rgba(0,0,0,.1) inset;-webkit-box-shadow:0 0 2px rgba(0,0,0,.1) inset;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_hc .cke_panel_listItem a{border-style:none}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:1px 2px}.cke_panel_grouptitle{font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:4px 6px;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #b6b6b6;-moz-border-radius:2px 2px 0 0;-webkit-border-radius:2px 2px 0 0;border-radius:2px 2px 0 0;-moz-box-shadow:0 1px 0 #fff inset;-webkit-box-shadow:0 1px 0 #fff inset;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#cfd1cf));background-image:-moz-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-webkit-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-o-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:-ms-linear-gradient(top,#f5f5f5,#cfd1cf);background-image:linear-gradient(top,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f5f5f5',endColorstr='#cfd1cf')}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_colorblock{padding:3px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}span.cke_colorbox{width:10px;height:10px;border:#808080 1px solid;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorbox{border:#fff 1px solid;padding:2px;float:left;width:12px;height:12px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{border:#b6b6b6 1px solid;background-color:#e5e5e5}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:2px;display:block;cursor:pointer}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{border:#b6b6b6 1px solid;background-color:#e5e5e5}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e4e4e4));background-image:-moz-linear-gradient(top,#fff,#e4e4e4);background-image:-webkit-linear-gradient(top,#fff,#e4e4e4);background-image:-o-linear-gradient(top,#fff,#e4e4e4);background-image:-ms-linear-gradient(top,#fff,#e4e4e4);background-image:linear-gradient(top,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_hc .cke_toolgroup{border:0;margin-right:10px;margin-bottom:10px}.cke_rtl .cke_toolgroup *:first-child{-moz-border-radius:0 2px 2px 0;-webkit-border-radius:0 2px 2px 0;border-radius:0 2px 2px 0}.cke_rtl .cke_toolgroup *:last-child{-moz-border-radius:2px 0 0 2px;-webkit-border-radius:2px 0 0 2px;border-radius:2px 0 0 2px}.cke_rtl .cke_toolgroup{float:right;margin-left:6px;margin-right:0}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0}.cke_rtl .cke_button{float:right}.cke_hc .cke_button{border:1px solid black;padding:3px 5px;margin:-2px 4px 0 -2px}.cke_button_on{-moz-box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);-webkit-box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);box-shadow:0 1px 5px rgba(0,0,0,.6) inset,0 1px 0 rgba(0,0,0,.2);background:#b5b5b5;background-image:-webkit-gradient(linear,left top,left bottom,from(#aaa),to(#cacaca));background-image:-moz-linear-gradient(top,#aaa,#cacaca);background-image:-webkit-linear-gradient(top,#aaa,#cacaca);background-image:-o-linear-gradient(top,#aaa,#cacaca);background-image:-ms-linear-gradient(top,#aaa,#cacaca);background-image:linear-gradient(top,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border-width:3px;padding:1px 3px}.cke_button_disabled .cke_button_icon{opacity:.3}.cke_hc .cke_button_disabled{opacity:.5}a.cke_button_on:hover,a.cke_button_on:focus,a.cke_button_on:active{-moz-box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2);-webkit-box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2);box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{-moz-box-shadow:0 0 1px rgba(0,0,0,.3) inset;-webkit-box-shadow:0 0 1px rgba(0,0,0,.3) inset;box-shadow:0 0 1px rgba(0,0,0,.3) inset;background:#ccc;background-image:-webkit-gradient(linear,left top,left bottom,from(#f2f2f2),to(#ccc));background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:-ms-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(top,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5)}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px -2px 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#c0c0c0;background-color:rgba(0,0,0,.2);margin:5px 2px 0;height:18px;width:1px;-webkit-box-shadow:1px 0 1px rgba(255,255,255,.5);-moz-box-shadow:1px 0 1px rgba(255,255,255,.5);box-shadow:1px 0 1px rgba(255,255,255,.5)}.cke_rtl .cke_toolbar_separator{float:right;-webkit-box-shadow:-1px 0 1px rgba(255,255,255,.1);-moz-box-shadow:-1px 0 1px rgba(255,255,255,.1);box-shadow:-1px 0 1px rgba(255,255,255,.1)}.cke_hc .cke_toolbar_separator{width:0;border-left:1px solid;margin:1px 5px 0 0}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #a6a6a6;border-bottom-color:#979797;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e4e4e4));background-image:-moz-linear-gradient(top,#fff,#e4e4e4);background-image:-webkit-linear-gradient(top,#fff,#e4e4e4);background-image:-o-linear-gradient(top,#fff,#e4e4e4);background-image:-ms-linear-gradient(top,#fff,#e4e4e4);background-image:linear-gradient(top,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_toolbox_collapser:hover{background:#ccc;background-image:-webkit-gradient(linear,left top,left bottom,from(#f2f2f2),to(#ccc));background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:-ms-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(top,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc')}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border-left:3px solid transparent;border-right:3px solid transparent;border-bottom:3px solid #474747;border-top:3px solid transparent}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#474747}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0;margin-right:2px}.cke_menubutton{display:block}.cke_menuitem span{cursor:default}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#d3d3d3;display:block}.cke_hc .cke_menubutton{padding:2px}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#d7d8d7;opacity:.70;filter:alpha(opacity=70);padding:4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#d0d2d0}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_menubutton_on{border:1px solid #dedede;background-color:#f2f2f2;-moz-box-shadow:0 0 2px rgba(0,0,0,.1) inset;-webkit-box-shadow:0 0 2px rgba(0,0,0,.1) inset;box-shadow:0 0 2px rgba(0,0,0,.1) inset}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#eff0ef}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d3d3d3;height:1px;filter:alpha(opacity=70);opacity:.70}.cke_menuarrow{background-image:url(images/arrow.png);background-position:0 10px;background-repeat:no-repeat;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:-2px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_button{display:inline-block;float:left;margin:0 6px 5px 0;border:1px solid #a6a6a6;border-bottom-color:#979797;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;-moz-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;box-shadow:0 1px 0 rgba(255,255,255,.5),0 0 2px rgba(255,255,255,.15) inset,0 1px 0 rgba(255,255,255,.15) inset;background:#e4e4e4;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e4e4e4));background-image:-moz-linear-gradient(top,#fff,#e4e4e4);background-image:-webkit-linear-gradient(top,#fff,#e4e4e4);background-image:-o-linear-gradient(top,#fff,#e4e4e4);background-image:-ms-linear-gradient(top,#fff,#e4e4e4);background-image:linear-gradient(top,#fff,#e4e4e4);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#ffffff',endColorstr='#e4e4e4')}.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus{background:#ccc;background-image:-webkit-gradient(linear,left top,left bottom,from(#f2f2f2),to(#ccc));background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:-ms-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(top,#f2f2f2,#ccc);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#f2f2f2',endColorstr='#cccccc');outline:0}.cke_combo_off a.cke_combo_button:active,.cke_combo_on a.cke_combo_button{border:1px solid #777;-moz-box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;-webkit-box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;box-shadow:0 1px 0 rgba(255,255,255,.5),0 1px 5px rgba(0,0,0,.6) inset;background:#b5b5b5;background-image:-webkit-gradient(linear,left top,left bottom,from(#aaa),to(#cacaca));background-image:-moz-linear-gradient(top,#aaa,#cacaca);background-image:-webkit-linear-gradient(top,#aaa,#cacaca);background-image:-o-linear-gradient(top,#aaa,#cacaca);background-image:-ms-linear-gradient(top,#aaa,#cacaca);background-image:linear-gradient(top,#aaa,#cacaca);filter:progid:DXImageTransform.Microsoft.gradient(gradientType=0,startColorstr='#aaaaaa',endColorstr='#cacaca')}.cke_combo_on a.cke_combo_button:hover,.cke_combo_on a.cke_combo_button:focus,.cke_combo_on a.cke_combo_button:active{-moz-box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2);-webkit-box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2);box-shadow:0 1px 6px rgba(0,0,0,.7) inset,0 1px 0 rgba(0,0,0,.2)}.cke_rtl .cke_combo_button{float:right;margin-left:5px;margin-right:0}.cke_hc a.cke_combo_button{padding:3px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border-width:3px;padding:1px}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.5);width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 7px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #474747}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}.cke_path_item,.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#4c4c4c;text-shadow:0 1px 0 #fff;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#bfbfbf;color:#333;text-shadow:0 1px 0 rgba(255,255,255,.5);-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px;-moz-box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5);-webkit-box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5);box-shadow:0 0 4px rgba(0,0,0,.5) inset,0 1px 0 rgba(255,255,255,.5)}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combo__fontsize .cke_combo_text{width:30px}.cke_combopanel__fontsize{width:120px}.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_top,.cke_contents,.cke_bottom{width:100%}.cke_button_arrow{font-size:0}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_button,.cke_rtl .cke_button *,.cke_rtl .cke_combo,.cke_rtl .cke_combo *,.cke_rtl .cke_path_item,.cke_rtl .cke_path_item *,.cke_rtl .cke_path_empty{float:none}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_combo_button,.cke_rtl .cke_combo_button *,.cke_rtl .cke_button,.cke_rtl .cke_button_icon,{display:inline-block;vertical-align:top}.cke_rtl .cke_button_icon{float:none}.cke_resizer{width:10px}.cke_source{white-space:normal}.cke_bottom{position:static}.cke_colorbox{font-size:0}.cke_button__about_icon {background: url(icons.png) no-repeat 0 -0px !important;}.cke_button__bold_icon {background: url(icons.png) no-repeat 0 -24px !important;}.cke_button__italic_icon {background: url(icons.png) no-repeat 0 -48px !important;}.cke_button__strike_icon {background: url(icons.png) no-repeat 0 -72px !important;}.cke_button__subscript_icon {background: url(icons.png) no-repeat 0 -96px !important;}.cke_button__superscript_icon {background: url(icons.png) no-repeat 0 -120px !important;}.cke_button__underline_icon {background: url(icons.png) no-repeat 0 -144px !important;}.cke_button__blockquote_icon {background: url(icons.png) no-repeat 0 -168px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png) no-repeat 0 -192px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png) no-repeat 0 -216px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png) no-repeat 0 -240px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png) no-repeat 0 -264px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png) no-repeat 0 -288px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png) no-repeat 0 -312px !important;}.cke_button__horizontalrule_icon {background: url(icons.png) no-repeat 0 -336px !important;}.cke_button__image_icon {background: url(icons.png) no-repeat 0 -360px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png) no-repeat 0 -384px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png) no-repeat 0 -408px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png) no-repeat 0 -432px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png) no-repeat 0 -456px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png) no-repeat 0 -480px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png) no-repeat 0 -504px !important;}.cke_button__link_icon {background: url(icons.png) no-repeat 0 -528px !important;}.cke_button__unlink_icon {background: url(icons.png) no-repeat 0 -552px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png) no-repeat 0 -576px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png) no-repeat 0 -600px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png) no-repeat 0 -624px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png) no-repeat 0 -648px !important;}.cke_button__maximize_icon {background: url(icons.png) no-repeat 0 -672px !important;}.cke_rtl .cke_button__pastetext_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons.png) no-repeat 0 -696px !important;}.cke_ltr .cke_button__pastetext_icon {background: url(icons.png) no-repeat 0 -720px !important;}.cke_rtl .cke_button__pastefromword_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons.png) no-repeat 0 -744px !important;}.cke_ltr .cke_button__pastefromword_icon {background: url(icons.png) no-repeat 0 -768px !important;}.cke_button__removeformat_icon {background: url(icons.png) no-repeat 0 -792px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png) no-repeat 0 -816px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png) no-repeat 0 -840px !important;}.cke_button__specialchar_icon {background: url(icons.png) no-repeat 0 -864px !important;}.cke_button__scayt_icon {background: url(icons.png) no-repeat 0 -888px !important;}.cke_button__table_icon {background: url(icons.png) no-repeat 0 -912px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png) no-repeat 0 -936px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png) no-repeat 0 -960px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png) no-repeat 0 -984px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png) no-repeat 0 -1008px !important;}.cke_button__spellchecker_icon {background: url(icons.png) no-repeat 0 -1032px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastetext_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons_hidpi.png) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon {background: url(icons_hidpi.png) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons_hidpi.png) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon {background: url(icons_hidpi.png) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_hidpi .cke_button__specialchar_icon {background: url(icons_hidpi.png) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_hidpi .cke_button__scayt_icon {background: url(icons_hidpi.png) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png) no-repeat 0 -960px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png) no-repeat 0 -984px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png) no-repeat 0 -1008px !important;background-size: 16px !important;}.cke_hidpi .cke_button__spellchecker_icon {background: url(icons_hidpi.png) no-repeat 0 -1032px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/public/assets/plugins/ckeditor/skins/moono/icons.png b/public/assets/plugins/ckeditor/skins/moono/icons.png
new file mode 100644
index 0000000000000000000000000000000000000000..c71008d700ecd88b3777e9e546b1c0e1e7c50b57
GIT binary patch
literal 10030
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
A`2YX_

literal 0
HcmV?d00001

diff --git a/public/assets/plugins/ckeditor/skins/moono/images/close.png b/public/assets/plugins/ckeditor/skins/moono/images/close.png
new file mode 100644
index 0000000000000000000000000000000000000000..04b9c97dde8273f8518060c82104b38b51832fa0
GIT binary patch
literal 824
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
zKpodXn9)gNb_D|iQ=q4dV~EA+rIQW2r5r_$|IbhBX1!iK_4XmB4ZGuZyxX>Mli(%E
z3$HvlGJ~HaFWITo!p#_bl)s>kG4~ILn4ZiInf3+cyI*T<`W(k~_vmY;nOSN7-tT?5
z_kMlG#)t>?(@N_U7A5H`{SZHU%5|y8mTLiCjxG~YC1*%7ESS=i8mXXUVBBMvkk)Zx
zV?z+v(jd;QQM_K73j+!*M=?Jx=(qL
zyV9$j>$uN4a_JV!q7Nf$g=w9`d^C7^PGA=~P!uT~qnS$!bq$4+Rn
zRm$m#aRaT?oBmm{=FQhCd#|NJzRQD|8O+Vit9IW#m0|Mh$eHi2ze*L#9F{1SQ8HHc
z4Zg9BH*Meg5Uo|W-`4Hlx9=LmhWqbRZRG0Hp8YoQowzL1@kK9x5mTUu>hHgCQ-VsW
z92RMKolEYT^XF2b3{bDqtLv}7DjKgo{7|9&u;Yx#t3aOM*WBA}k1bpkwU1Xgef{_8
zQ_+pAttB$Yjb{4TF*LmYZ6CdM+Pt%A&Pql~pVU2tB$E3i4jY^)wB33;_hapR#yj&8
z_k69LfBWq=h6*9Umc$MPj)YE+L~jQEM2UT~&p(fMdGbAP`{}*^yE`_mUcEY>LGD~J
zSC6>3_=>RA3QDRDyr(~v8;?`jEllcfxgCxj?;QX|b^2DN4hVt@qz0ADq;^f4F
ZRK5J7^x5xhq=1STJYD@<);T3K0RTH-Q&a!|

literal 0
HcmV?d00001

diff --git a/public/assets/plugins/ckeditor/skins/moono/images/hidpi/close.png b/public/assets/plugins/ckeditor/skins/moono/images/hidpi/close.png
new file mode 100644
index 0000000000000000000000000000000000000000..8abca8e9726db1db199a0872d24b08842ec8ea62
GIT binary patch
literal 1792
zcmZ`)X*An;7yerkv6Xst1TBfBwUwZ@G-RQc6k}p}F=!)Vk1aF^tr!NatxZg*+G=a9
z$BccH7;0_lieXwx?NUK&X^V-E?}zvN?!C`F_dL(J_shM%3@1k$NihX6001QIY^?}<
zgq=79%#YOg_|JR*`(CxN0*+5!>62p|r!CQn=dr%@QoXUW@HVO`w&xa@b~
zimnO+B~%o1dTS~&Bxm7D?j0F5g)pSG@A?GAB>3)#e=5QbYpW<4wlCEVG}BukyLtjI
zvs$O?O&kjyWX04X&p5eh_dkuYe4Ku-U9?~;p-4}6V{4#^$&2ju*|6>2F&y7~uv5Gj
zm-hYJFH*d#7N6x}j?tWB6d-_s2pov&9hG_3m*f&|yX%1Q5D44}kJSRfg)0b7_%9~v
z!mQlB76R^^2uAaYfzsfxi`Z~%*N%*yMAN!y1WL*)T?vANG`mY!t1vQ&Fnz>}m&S?8
zms_){HZ5)AOaZuXXBFJ!QcCYATN%VVpR^A63w-xT-2Gdwu&{6{=7Dbd5Q+pHTHb*@
zorflw0QNw>05AK`=Fbj8W@;pFo;eWdZKIMWn1nuD8p&I&9vI-2G65j|g@5c4FRg_H
z(M4>V9{pVT>WwprAdVVI;|)n`v*ov}{o2L8rtc
z5BpbNJK?Tx3|}DT;hiho-^4fwslOxt4T9wbpPpE^7gUZb7C}Si;*?^c^NYj7kcTWi
z+1#tuclo9#i_xiN=|7(yWio@5ew}K}r1i+VbMS`ovF`6K>#0S$;6KwWuOafXK
zmqg8mL13nXE|vF2@|Sd)>UJ*JSVu(p3HSd#7GO`kQA4oH*u7=8ERExA9Y!R^9e58$
z&ZQBo5H+Fd9A5SC)cjCjaQb3TLYjA{g&xk*EtmqqMv6AgC(`g}X
z#Lll`NGD(3**OKE=wE8eSjp+n1Y$E&Zyoab>{@=`&IwnPoNAcqG!voQ^q8Jc!IVd%
z`>A?fJr+zT)buphO6Q05SLwSgE-4)GzPY6=MP@LW+)C0V&w?k~&S+P1DpRI+7WM7paY+QRK!vWNqVvlSo@$uG
zrDXq8DT{+FaW^iN1znUhvlv+U&|SZaWZBQNf|4JYIgfpeautMrbNlB&6pjH@nWL`5
z1%`{xRT*V|GM+l%C}D{CNY`th@#2e81^!>w_S;W`?0ZyIQ|9=ozTbVPKJQ@%s>&sdrZ^fXRd8Ojmu12hu9`9Aj3(7b%kQ42J<_sgH+;%8hN$BmRwn1x=U
zNAZcD!sr(sX4plXQdigg4G-q?Q;4wlN`zCOmHsC3s%m-p
z@6&TiDCI*LWuc5hB87;ry?@e?BPXXl+Y!cR-Q*6ftnhact&=TJataBlTm9Dd9flb)
z6CC3oo!;$Ngu#UInBM8@^oALRyN_qh2GUVFB0HD5k4>uDJoc`y*B@~I@hr_qrBXIw
z;6*d#QuonUsbiUB3xbAyXlU5cACbpL^ctUIHG^67y)9$m*4EOsFJ{}%49ESI=^OPp
z3-l3pX{kPKZ}Ye*Xoe@1N#ejGQP3RKLPymCJOg#u+%PebA21WUVjB4M=&ofD|1fIy
zVSGzkgJuFZxV>CM)@~LFuNm!N=`~pvq5xgy$qOxXZ3Z4vo6S8+0f;7C-g3xH16~x)
zD90^U2TMto+p29Xlqi=UDz%Z%8h{y#Q2x)M9(~0<+K(7bMv|h)d;km(`i2(~#up6`
zF8T;0!Wd~_q>V5@A`q~T(98cLpoIGc`N#c#!A~8fX?%hFNeAa}|7aR9iVV!>vv
zaJ2^WU>K1A5CACz61I(8CIc!K4?~El%)x`jqeqXvPeK^ao;`c?^7-?JaGYEG;K9o3
z#s(_&`mP`%0T4nUK04|b|LoJNSAR^}c3dgdW#IUcBNv2WT-d7B=BZfxlJDRD3CyVM
z!i0zd!0@`KV)2_Vu3fvHwCy-61u(+^U;u#D(5{O;mKC3#on4GgP2I}v+lPd0LkiJ%
zXd?j##1B7Tzy58d(P(HQkYT_uO&F#LAti_itTjvkm#3yK)0s1~xl9J}SPVjhm!c?Z
zXm}E2l1bR96eyp6Z**+z>*nU>zi^!20F(io`}oqO@88Yk##t#a5h{&F?bjPO@|C5f
zmDN|T(01Lon*psgYRx9vt_!{g%A+l^uxA)p<~B>|LEeye-0ivFb-xU
zY&#AqKe0^nJ3$1(PM?SbfPv0#I}RMzMYYlBQtEp{!nVPWAD8LGiLXANnYqPEK?6wd
z-+!71c*0Od#LQ5h(R7E(>r88nxMcyrAB}b!CJ~g@7#|-$rL=xySUoXt2npeqyX}k_
z48Tzeud7w?^786twF<{|p_D>8ozAhhs=iweWMGHgdIfe1B7*C>P|YUl%_jDkCICPw
z1;a2fVw!KH3`nvAfDi(lH$1qT9wNS3r
zP;a%m2DW1jN2EkHoksfn`Lkma6AMQUA1>$t8uo&>q(mYX!>H`^)^c6c+HE{}`gD1H
zWo3Tz&YgRu&CTvgZexHvDlI87HZigA!O4>a0?^ekLI|SHYI=H)NC{I)Oy={2KbaRS
zDJLnglA&9`%$PWIr~qb2AppaO3?P`J+Y|uhm%y1kB%5@y2;#M4e>bhj%=t&TojiAiBkw!-4qcJ)rwC
zpp@!-0!4xVo9(vq*TaW5w@Rf&07z!DbCah}Ul|=4F?$*FB~VI5V8EZyKo7txd;4^Tmt#znK^IXS0Q%%Y`N1?HLhay;NFmy?i;}bewG-
zvx5PpHC|V%*jie;H)@)beUlH#001-{2d}Hu?qwttfYuuIW)rP;8`S42J#_s5yZ)8T
zkN*KKV$V(cQ>;h;001R)MObuXVRU6WV{&C-bY%cCFflVNFg7hRFjO%!IyEyoH8d+Q
zGCD9Yrs5G^0000bbVXQnWMOn=I&E)cX=Zrj$Be^|o0KsI
zgE0^V5Ok0-_^-8wR0>L|uE2B+fQY~ugKOL9a~woChgJ$wDFCQ~Vhj}_kS~=`JUoO@
z3R-uD(G`F&dDL-`jK@Lg^e{~G)>o%ajh;Jq?h*jJef#$1$My9W@csMx`SZ2h&JGSr
zr6WNc380qTwvp`b2c^?96Sr^Q?R8yONm*my;@Pv;m|W|HwZT-yd?
zty6WBz+eo0jsr@khi^_!-sM387zX}bUw{Am!-sbOJPx*B`SHe$Urr^HLt093BHWyu
zyi4iy9|z0JYbDRC$<-AA0>Fr1nI^#bt*GO;PzoTze;XU`mlhXC^s85S93ECbu+mk1Upf#e7BmTCUXh(KueiH;KJfbQ7f;HY1zKnek=6qXhj@95Rl
z{7x>1cN-gcx3PhpTn>75HNUjDctNmTcJtT5Fs+eL4lLYZ`}MPN*7`fzG3TKLLq%(l9LhDXm
zf1(h~^OrC0<)1v6#{PbFp|^KBcI67b&t#@r$)STe3UVANfszuc1p`C`Foyir)&dR=
zklWq{03?Z!-`ZMGT2G|goGmciR6SB}4tdnVl@u({w
zAVO|)bLC`zf2!Syjx~rNltONEbETsMVYPa`5AVZ=xxclZA50`t^)A;c_)%*_gstuE
zmGZ}rbDr;i<}pnSNTsk_C}4ki`RNJM%(M-DOa=hJ^L^|V3ZFgCn*b=KQ1U#KD-}?i
zr}VM&*RdNu$-?nJOgt6(yB#*j0000bbVXQnWMOn=I%9HWVRU5xGB7bSEig7MGB8vz
zGdeXgIx{&dFfuwYFz%QVCjbBdC3HntbYx+4WjbwdWNBu305UK!Gc7PSEiy1vF*7eSaefwW^{L9a%BK_cXuvnZfkR6VQ^(GZ*pgw?mQX*
O0000o~>%;(}uwZxScCw6p<*hDw!y1_~0Q&&4D4o5YwX{iKohVrR~K&ikJCoKKv4
z;|*^22tZL3R8>V00x2bq=izxCQp#KUhIZT0{orOOL^2j5913AO4%bR0N|g$>>)sNG
z+Xf&2RaNPV#fa?Lb06?H@T#1h_0(*Ze7Sr}Ae7q;ju5Ddf*A|~Xy1P5p_fH4cwCH)
zZAhilbj4zXbRA7q5kma`00ba}KvPw8UB}RMLb{F!1ORy8{`-06$tNFHg28E#$voUM
zFu-6sO(GH@unvf?r9cRQ;s@4L71JZ`J0=$|U;ZuK-M_wi=#aBgC}8{l)z%80h(t)G(}=OLArTDzdB@n;13R~G
zM|vKv>(Xd6uq+FFKBbiHr*%Bf!*g8}P2+p}_KCk9KCHTHwB&UFR7D|Xn)Eg^zuQbC
zrXJn9H`1L<((udXwSxJ8g%F4i5FOdz0r_Gv|Mrn1KanR-zEjHQxmGOF2}JA6KA>r&
z;&H^-m@4V=DBB|J%bQP&!gdaOwY{x;j@oF{)Ies%38d7
zm14DuvtApjs!A*zMvRQywRvdh)$U{x%d(m;s4D;X@WYq0M~=KwTUlXYaS_Y5(KU^J
zRRzasQ&6tg%SVnL{i!^8@{MY##Fgb`D)suB!P@|YUxARW13a~R=T6gZG;lo+Aq1DN
zT>1Or#f!hO^LdsE1!_Jp3E->Q1#(xfe*E6CV?UCoPoK}_a+K?JY{zNqX04;O1f%$m
zh(yMP5V)?3Cnc8S*#CO}{R8sM8M&CtQEvhBh1Y7Q56+%_eg53JpUKI|YHoS?%aV6!
z>?Vqgbut`T~-G>v@!_RS1XAU3~4e
z=WCS;*`+0_z9Z^^KzjyAU&O92LfHwR&3`77dU)TyJLo9cXY=#ZvR0#9tKGz->v>&*ME3025A40+l~;=Iy_ap#2%t%5a&6lH=j)9IK~-&X
z44`RS6;(x1)}Gv+lx;_BIcdZ&K-Uk9@7VFErm9FODORiYzh`C+-Z++(rjT8V)hcp&
z`dW5*`7_&baD6LHr_&islc-^=JJ(wSEMgd7n%p%slo{ynXH#Dv8~gfDG;L1K&RXSK
zt(|=vfG1_MwQ4oyFI}3F9a(MJy!jhqbabL;!-lV1E?U9kkqD{YUc~6=BZC_^rd{92
zY};o3(xoY?Rce-X9i57=kfuUCkNncoWQ$LvBpHt@(PZ*9k;#NpeSIWjF${mzQv97E
z7zof6jnbP=Berkv>e{g3PchSMD&Ln
zwwtDOqXs%#N}fKQJ$d59!Ipj6j)SggOpK2|VZ>q|iQ(bzs}mDS>drg4V_<;v;2;AB
z4rpRz>2(7RXmBH+e~W7)ii!T}rhY(L#ZRPd|NWV>*2{VVb?FZ=;H$Fgh~A*5P5Z
zSS&tRt<@ehO_PXeqACiW=i&G}p9|zmrAxVs7Z2781xjle*>wO~Zq>To$kV5@V)yQ`
z-oe4&Z`r*02_q1oRazkgW;l!)4mas@9320{u9Vap4gUN2=dUl#&mWYNldB6$OW6Lz
zys3R}+6kd;Cdp`&P$GfYvE%8TyLbOCVi-MwFYknk5Y0uUe9*zrE2wS$FW%NcHFksP>6UWLMRYuZb9KNV%s(YxD)tP&dyr+
z4retQeSaefw
qW^{L9a%BK_cXuvnZfkR6VQ^(GZ*pgw?mQX*0000Pv#92Gn{xdL
z;ybi2J@KEc#outLz<)xAxPw!Y_5ueF?j*-<+wA2JrZFg<@|dPm{pY9od|Q*beuZ)_
zENN{)TxV*cwqJ8{Nm$!j{BFy-b^O{(1J;HKvM{bo-W!*^`>vCVpHj`d17|d*pXO*{
zaQV{LQ6~`S+X5h+@3mGPQuXZo;{{43!Kf~HE?$uYhcHe#XqVaj+3_1CJ_iPu>Q&N*iHUd(8@ndA2P=buYQ40sl9WfPoR
zWBK3XT9ibxK-<;C{%
z&%a-+;WTTRfS?Q?drIUt_Xl_G9!>hFqx8PpFD32D>(V8eT_;nDUY&Sa^mEPDw&Hgl
z3Q7^{uV09|Kh;b1kA9D#$0Qb|ru$PJC2J&mAN&HQ4Am0Xh?11Vl2ohYqEsNoU}Ruu
ztZQJdYhV&$Xl`X-3`E)nMpgy}zDsrkQw@@a-29Zxv`X9>Y<@By0cwy0*$|wcR#Ki=
ml*&+EUaps!mtCBkSdglhUz9%kosASw5re0zpUXO@geCymsw?6E

literal 0
HcmV?d00001

diff --git a/public/assets/plugins/ckeditor/skins/moono/images/lock.png b/public/assets/plugins/ckeditor/skins/moono/images/lock.png
new file mode 100644
index 0000000000000000000000000000000000000000..c127f9ebe788baaf9c69bea6d1c7653d990cbe3c
GIT binary patch
literal 728
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
zKpodXn9)gNb_D|i<3~>y#}JFtwUamcJ$4Xi+b?OIx5#CqXV9F5Wxj{CWzI9}I~1#a
zxe)M?q2wX2-yR1Qm6(Yl9w#m)DsJBWEpFlsaiv2;q%iS9F@!!9`;&sdy-?D_h?Q(q*;!@Xr
zV*c4mE2&-y9=7-yFU!6waO`^Yu%KeH%1PY`s-8vGGJN?_6BIZECcgK-;k1vV>B05e
zw{L%aRyS9L^8l;C?_&!@*Ij?jI3e|BVW3Dk!?h@eu0=aeZ+auK;QH%@t6uNgR=ody
zy3tGqgSmdn?`v`p(oynm@B2FvhaW#y*4NkH6rr=P%R;Vy@CgHpZ{!H
zwJLSq^XbxxyXWj>$o)R8an-!;6a1mJ`I1|7zP)n_4XvrE3Ak>WC{a{WQnD>V=iDWe
zr8?eoifiiXfN&PEETh{4m<&t;ucLK6UWP&V5D

literal 0
HcmV?d00001

diff --git a/public/assets/plugins/ckeditor/skins/moono/images/refresh.png b/public/assets/plugins/ckeditor/skins/moono/images/refresh.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1a061c50de209f0b3749537a6a20fba2b93c8e3
GIT binary patch
literal 953
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
zKpodXn9)gNb_D|i(=iY?K-
z+T>WE_|9u#iQ?6_3VMH-)0Rt%@4C1)k0tvrvkZ&loF;Dff{VURL7EFQFE4q&cfzy3
zyEe~Io3gXOO#IyOrv>Y-ye^HC6Fg|Zv+1TzaBy%32gBbw`SYJU7IB2K9;mpPF-z@b
z$*deR?~M^h40Ve#ULHzQ+dU=I$FK<`iUaz4iRSe5FrS
zX0ui2pHGeyQ)*)MIVU^YWeHafbN;PubEBf8ldGzJy9yaFtrFZ>9zj|)JT`TzH=g*%O7yY+w
z-(Ff@AAkDkr|k!{%YV;oZf0J4HS0ekf9TZNv!&0SJC|W1b>a2bfKZ;pKdSTd{lmk;
z>ViX$F{O!#iPf>ltl`$5UteQoE)C=@^Vp&fY6xhvdmBH3f7!H
z?LF(PT3d%eTcX+IlQ#lI7-N`O939qQSLSivdwp`e%afTMHdV$tqPW~jOU|4`{&{%O;vd(ZWIzOti+-G(*I=klM5?CjN2
zER5>v>iwZxU+&T?luK3-Pe-~bU
zDYGi;PTuyNd-opon#6Mcvw^R0=-*hEFr%4grhoqY`F)7i)T0)Cd($@m%wK)=ms@B*
z!@BkBIhzr!AdYO6I#mR{Use1WE>9gP2NC6cwc)I$z
JtaD0e0su#cn~(qi

literal 0
HcmV?d00001

diff --git a/public/assets/plugins/ckeditor/skins/moono/readme.md b/public/assets/plugins/ckeditor/skins/moono/readme.md
new file mode 100644
index 00000000..0fa4c1ac
--- /dev/null
+++ b/public/assets/plugins/ckeditor/skins/moono/readme.md
@@ -0,0 +1,51 @@
+"Moono" Skin
+====================
+
+This skin has been chosen for the **default skin** of CKEditor 4.x, elected from the CKEditor
+[skin contest](http://ckeditor.com/blog/new_ckeditor_4_skin) and further shaped by
+the CKEditor team. "Moono" is maintained by the core developers.
+
+For more information about skins, please check the [CKEditor Skin SDK](http://docs.cksource.com/CKEditor_4.x/Skin_SDK)
+documentation.
+
+Features
+-------------------
+"Moono" is a monochromatic skin, which offers a modern look coupled with gradients and transparency.
+It comes with the following features:
+
+- Chameleon feature with brightness,
+- high-contrast compatibility,
+- graphics source provided in SVG.
+
+Directory Structure
+-------------------
+
+CSS parts:
+- **editor.css**: the main CSS file. It's simply loading several other files, for easier maintenance,
+- **mainui.css**: the file contains styles of entire editor outline structures,
+- **toolbar.css**: the file contains styles of the editor toolbar space (top),
+- **richcombo.css**: the file contains styles of the rich combo ui elements on toolbar,
+- **panel.css**: the file contains styles of the rich combo drop-down, it's not loaded
+until the first panel open up,
+- **elementspath.css**: the file contains styles of the editor elements path bar (bottom),
+- **menu.css**: the file contains styles of all editor menus including context menu and button drop-down,
+it's not loaded until the first menu open up,
+- **dialog.css**: the CSS files for the dialog UI, it's not loaded until the first dialog open,
+- **reset.css**: the file defines the basis of style resets among all editor UI spaces,
+- **preset.css**: the file defines the default styles of some UI elements reflecting the skin preference,
+- **editor_XYZ.css** and **dialog_XYZ.css**: browser specific CSS hacks.
+
+Other parts:
+- **skin.js**: the only JavaScript part of the skin that registers the skin, its browser specific files and its icons and defines the Chameleon feature,
+- **icons/**: contains all skin defined icons,
+- **images/**: contains a fill general used images,
+- **dev/**: contains SVG source of the skin icons.
+
+License
+-------
+
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+
+Licensed under the terms of any of the following licenses at your choice: [GPL](http://www.gnu.org/licenses/gpl.html), [LGPL](http://www.gnu.org/licenses/lgpl.html) and [MPL](http://www.mozilla.org/MPL/MPL-1.1.html).
+
+See LICENSE.md for more information.
diff --git a/public/assets/plugins/ckeditor/styles.js b/public/assets/plugins/ckeditor/styles.js
new file mode 100644
index 00000000..b58e0bda
--- /dev/null
+++ b/public/assets/plugins/ckeditor/styles.js
@@ -0,0 +1,111 @@
+/**
+ * Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md or http://ckeditor.com/license
+ */
+
+// This file contains style definitions that can be used by CKEditor plugins.
+//
+// The most common use for it is the "stylescombo" plugin, which shows a combo
+// in the editor toolbar, containing all styles. Other plugins instead, like
+// the div plugin, use a subset of the styles on their feature.
+//
+// If you don't have plugins that depend on this file, you can simply ignore it.
+// Otherwise it is strongly recommended to customize this file to match your
+// website requirements and design properly.
+
+CKEDITOR.stylesSet.add( 'default', [
+	/* Block Styles */
+
+	// These styles are already available in the "Format" combo ("format" plugin),
+	// so they are not needed here by default. You may enable them to avoid
+	// placing the "Format" combo in the toolbar, maintaining the same features.
+	/*
+	{ name: 'Paragraph',		element: 'p' },
+	{ name: 'Heading 1',		element: 'h1' },
+	{ name: 'Heading 2',		element: 'h2' },
+	{ name: 'Heading 3',		element: 'h3' },
+	{ name: 'Heading 4',		element: 'h4' },
+	{ name: 'Heading 5',		element: 'h5' },
+	{ name: 'Heading 6',		element: 'h6' },
+	{ name: 'Preformatted Text',element: 'pre' },
+	{ name: 'Address',			element: 'address' },
+	*/
+
+	{ name: 'Italic Title',		element: 'h2', styles: { 'font-style': 'italic' } },
+	{ name: 'Subtitle',			element: 'h3', styles: { 'color': '#aaa', 'font-style': 'italic' } },
+	{
+		name: 'Special Container',
+		element: 'div',
+		styles: {
+			padding: '5px 10px',
+			background: '#eee',
+			border: '1px solid #ccc'
+		}
+	},
+
+	/* Inline Styles */
+
+	// These are core styles available as toolbar buttons. You may opt enabling
+	// some of them in the Styles combo, removing them from the toolbar.
+	// (This requires the "stylescombo" plugin)
+	/*
+	{ name: 'Strong',			element: 'strong', overrides: 'b' },
+	{ name: 'Emphasis',			element: 'em'	, overrides: 'i' },
+	{ name: 'Underline',		element: 'u' },
+	{ name: 'Strikethrough',	element: 'strike' },
+	{ name: 'Subscript',		element: 'sub' },
+	{ name: 'Superscript',		element: 'sup' },
+	*/
+
+	{ name: 'Marker',			element: 'span', attributes: { 'class': 'marker' } },
+
+	{ name: 'Big',				element: 'big' },
+	{ name: 'Small',			element: 'small' },
+	{ name: 'Typewriter',		element: 'tt' },
+
+	{ name: 'Computer Code',	element: 'code' },
+	{ name: 'Keyboard Phrase',	element: 'kbd' },
+	{ name: 'Sample Text',		element: 'samp' },
+	{ name: 'Variable',			element: 'var' },
+
+	{ name: 'Deleted Text',		element: 'del' },
+	{ name: 'Inserted Text',	element: 'ins' },
+
+	{ name: 'Cited Work',		element: 'cite' },
+	{ name: 'Inline Quotation',	element: 'q' },
+
+	{ name: 'Language: RTL',	element: 'span', attributes: { 'dir': 'rtl' } },
+	{ name: 'Language: LTR',	element: 'span', attributes: { 'dir': 'ltr' } },
+
+	/* Object Styles */
+
+	{
+		name: 'Styled image (left)',
+		element: 'img',
+		attributes: { 'class': 'left' }
+	},
+
+	{
+		name: 'Styled image (right)',
+		element: 'img',
+		attributes: { 'class': 'right' }
+	},
+
+	{
+		name: 'Compact table',
+		element: 'table',
+		attributes: {
+			cellpadding: '5',
+			cellspacing: '0',
+			border: '1',
+			bordercolor: '#ccc'
+		},
+		styles: {
+			'border-collapse': 'collapse'
+		}
+	},
+
+	{ name: 'Borderless Table',		element: 'table',	styles: { 'border-style': 'hidden', 'background-color': '#E6E6FA' } },
+	{ name: 'Square Bulleted List',	element: 'ul',		styles: { 'list-style-type': 'square' } }
+]);
+
diff --git a/public/assets/css/colorpicker/bootstrap-colorpicker.css b/public/assets/plugins/colorpicker/bootstrap-colorpicker.css
old mode 100755
new mode 100644
similarity index 89%
rename from public/assets/css/colorpicker/bootstrap-colorpicker.css
rename to public/assets/plugins/colorpicker/bootstrap-colorpicker.css
index 8252394f..ba4365e2
--- a/public/assets/css/colorpicker/bootstrap-colorpicker.css
+++ b/public/assets/plugins/colorpicker/bootstrap-colorpicker.css
@@ -13,7 +13,7 @@
   width: 100px;
   height: 100px;
   cursor: crosshair;
-  background-image: url("../../img/bootstrap-colorpicker/saturation.png");
+  background-image: url("img/saturation.png");
 }
 
 .colorpicker-saturation i {
@@ -64,12 +64,12 @@
 }
 
 .colorpicker-hue {
-  background-image: url("../../img/bootstrap-colorpicker/hue.png");
+  background-image: url("img/hue.png");
 }
 
 .colorpicker-alpha {
   display: none;
-  background-image: url("../../img/bootstrap-colorpicker/alpha.png");
+  background-image: url("img/alpha.png");
 }
 
 .colorpicker {
@@ -135,7 +135,7 @@
   height: 10px;
   margin-top: 5px;
   clear: both;
-  background-image: url("../../img/bootstrap-colorpicker/alpha.png");
+  background-image: url("img/alpha.png");
   background-position: 0 100%;
 }
 
@@ -194,11 +194,11 @@
 }
 
 .colorpicker.colorpicker-horizontal .colorpicker-hue {
-  background-image: url("../../img/bootstrap-colorpicker/hue-horizontal.png");
+  background-image: url("img/hue-horizontal.png");
 }
 
 .colorpicker.colorpicker-horizontal .colorpicker-alpha {
-  background-image: url("../../img/bootstrap-colorpicker/alpha-horizontal.png");
+  background-image: url("img/alpha-horizontal.png");
 }
 
 .colorpicker.colorpicker-hidden {
diff --git a/public/assets/js/plugins/colorpicker/bootstrap-colorpicker.js b/public/assets/plugins/colorpicker/bootstrap-colorpicker.js
old mode 100755
new mode 100644
similarity index 100%
rename from public/assets/js/plugins/colorpicker/bootstrap-colorpicker.js
rename to public/assets/plugins/colorpicker/bootstrap-colorpicker.js
diff --git a/public/assets/plugins/colorpicker/bootstrap-colorpicker.min.css b/public/assets/plugins/colorpicker/bootstrap-colorpicker.min.css
new file mode 100644
index 00000000..16a2d1a0
--- /dev/null
+++ b/public/assets/plugins/colorpicker/bootstrap-colorpicker.min.css
@@ -0,0 +1,9 @@
+/*!
+ * Bootstrap Colorpicker
+ * http://mjolnic.github.io/bootstrap-colorpicker/
+ *
+ * Originally written by (c) 2012 Stefan Petre
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0.txt
+ *
+ */.colorpicker-saturation{float:left;width:100px;height:100px;cursor:crosshair;background-image:url("img/saturation.png")}.colorpicker-saturation i{position:absolute;top:0;left:0;display:block;width:5px;height:5px;margin:-4px 0 0 -4px;border:1px solid #000;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.colorpicker-saturation i b{display:block;width:5px;height:5px;border:1px solid #fff;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.colorpicker-hue,.colorpicker-alpha{float:left;width:15px;height:100px;margin-bottom:4px;margin-left:4px;cursor:row-resize}.colorpicker-hue i,.colorpicker-alpha i{position:absolute;top:0;left:0;display:block;width:100%;height:1px;margin-top:-1px;background:#000;border-top:1px solid #fff}.colorpicker-hue{background-image:url("img/hue.png")}.colorpicker-alpha{display:none;background-image:url("img/alpha.png")}.colorpicker{top:0;left:0;z-index:2500;min-width:130px;padding:4px;margin-top:1px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;*zoom:1}.colorpicker:before,.colorpicker:after{display:table;line-height:0;content:""}.colorpicker:after{clear:both}.colorpicker:before{position:absolute;top:-7px;left:6px;display:inline-block;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-left:7px solid transparent;border-bottom-color:rgba(0,0,0,0.2);content:''}.colorpicker:after{position:absolute;top:-6px;left:7px;display:inline-block;border-right:6px solid transparent;border-bottom:6px solid #fff;border-left:6px solid transparent;content:''}.colorpicker div{position:relative}.colorpicker.colorpicker-with-alpha{min-width:140px}.colorpicker.colorpicker-with-alpha .colorpicker-alpha{display:block}.colorpicker-color{height:10px;margin-top:5px;clear:both;background-image:url("img/alpha.png");background-position:0 100%}.colorpicker-color div{height:10px}.colorpicker-element .input-group-addon i{display:block;width:16px;height:16px;cursor:pointer}.colorpicker.colorpicker-inline{position:relative;display:inline-block;float:none}.colorpicker.colorpicker-horizontal{width:110px;height:auto;min-width:110px}.colorpicker.colorpicker-horizontal .colorpicker-saturation{margin-bottom:4px}.colorpicker.colorpicker-horizontal .colorpicker-color{width:100px}.colorpicker.colorpicker-horizontal .colorpicker-hue,.colorpicker.colorpicker-horizontal .colorpicker-alpha{float:left;width:100px;height:15px;margin-bottom:4px;margin-left:0;cursor:col-resize}.colorpicker.colorpicker-horizontal .colorpicker-hue i,.colorpicker.colorpicker-horizontal .colorpicker-alpha i{position:absolute;top:0;left:0;display:block;width:1px;height:15px;margin-top:0;background:#fff;border:0}.colorpicker.colorpicker-horizontal .colorpicker-hue{background-image:url("img/hue-horizontal.png")}.colorpicker.colorpicker-horizontal .colorpicker-alpha{background-image:url("img/alpha-horizontal.png")}.colorpicker.colorpicker-hidden{display:none}.colorpicker.colorpicker-visible{display:block}.colorpicker-inline.colorpicker-visible{display:inline-block}
\ No newline at end of file
diff --git a/public/assets/js/plugins/colorpicker/bootstrap-colorpicker.min.js b/public/assets/plugins/colorpicker/bootstrap-colorpicker.min.js
old mode 100755
new mode 100644
similarity index 100%
rename from public/assets/js/plugins/colorpicker/bootstrap-colorpicker.min.js
rename to public/assets/plugins/colorpicker/bootstrap-colorpicker.min.js
diff --git a/public/assets/plugins/colorpicker/img/alpha-horizontal.png b/public/assets/plugins/colorpicker/img/alpha-horizontal.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0a65c08b0ed34d969cb0e93165a2e8b0ef9dbd7
GIT binary patch
literal 3635
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
FV1h0U4od(4

literal 0
HcmV?d00001

diff --git a/public/assets/plugins/colorpicker/img/alpha.png b/public/assets/plugins/colorpicker/img/alpha.png
new file mode 100644
index 0000000000000000000000000000000000000000..38043f1c85f20fe8ce37ad380bebe2d42d14fb29
GIT binary patch
literal 3271
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

literal 0
HcmV?d00001

diff --git a/public/assets/plugins/colorpicker/img/hue.png b/public/assets/plugins/colorpicker/img/hue.png
new file mode 100644
index 0000000000000000000000000000000000000000..d89560e999f86c349ddc78c298b0328293f13e1e
GIT binary patch
literal 2972
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	>YjDHRkjMe3FzWUPlrRR$Vj
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

literal 0
HcmV?d00001

diff --git a/public/assets/plugins/datatables/dataTables.bootstrap.css b/public/assets/plugins/datatables/dataTables.bootstrap.css
new file mode 100644
index 00000000..2ccacaff
--- /dev/null
+++ b/public/assets/plugins/datatables/dataTables.bootstrap.css
@@ -0,0 +1,372 @@
+div.dataTables_length label {
+	font-weight: normal;
+	text-align: left;
+	white-space: nowrap;
+}
+
+div.dataTables_length select {
+	width: 75px;
+	display: inline-block;
+}
+
+div.dataTables_filter {
+	text-align: right;
+}
+
+div.dataTables_filter label {
+	font-weight: normal;
+	white-space: nowrap;
+	text-align: left;
+}
+
+div.dataTables_filter input {
+	margin-left: 0.5em;
+	display: inline-block;
+	width: auto;
+}
+
+div.dataTables_info {
+	padding-top: 8px;
+	white-space: nowrap;
+}
+
+div.dataTables_paginate {
+	margin: 0;
+	white-space: nowrap;
+	text-align: right;
+}
+
+div.dataTables_paginate ul.pagination {
+	margin: 2px 0;
+	white-space: nowrap;
+}
+
+@media screen and (max-width: 767px) {
+	div.dataTables_wrapper > div.row > div,
+	div.dataTables_length,
+	div.dataTables_filter,
+	div.dataTables_info,
+	div.dataTables_paginate {
+		text-align: center;
+	}
+
+	div.DTTT {
+		margin-bottom: 0.5em;
+	}
+}
+
+
+table.dataTable td,
+table.dataTable th {
+	-webkit-box-sizing: content-box;
+	-moz-box-sizing: content-box;
+	box-sizing: content-box;
+}
+
+
+table.dataTable {
+	clear: both;
+	margin-top: 6px !important;
+	margin-bottom: 6px !important;
+	max-width: none !important;
+}
+
+table.dataTable thead .sorting,
+table.dataTable thead .sorting_asc,
+table.dataTable thead .sorting_desc,
+table.dataTable thead .sorting_asc_disabled,
+table.dataTable thead .sorting_desc_disabled {
+	cursor: pointer;
+	position: relative;
+}
+
+table.dataTable thead .sorting:after,
+table.dataTable thead .sorting_asc:after,
+table.dataTable thead .sorting_desc:after {
+	position: absolute;
+	top: 8px;
+	right: 8px;
+	display: block;
+	font-family: 'Glyphicons Halflings';
+	opacity: 0.5;
+}
+table.dataTable thead .sorting:after {
+	opacity: 0.2;
+	content: "\e150"; /* sort */
+}
+table.dataTable thead .sorting_asc:after {
+	content: "\e155"; /* sort-by-attributes */
+}
+table.dataTable thead .sorting_desc:after {
+	content: "\e156"; /* sort-by-attributes-alt */
+}
+div.dataTables_scrollBody table.dataTable thead .sorting:after,
+div.dataTables_scrollBody table.dataTable thead .sorting_asc:after,
+div.dataTables_scrollBody table.dataTable thead .sorting_desc:after {
+	display: none;
+}
+
+table.dataTable thead .sorting_asc_disabled:after,
+table.dataTable thead .sorting_desc_disabled:after {
+	color: #eee;
+}
+
+table.dataTable thead > tr > th {
+	padding-right: 30px;
+}
+
+table.dataTable th:active {
+	outline: none;
+}
+
+
+/* Condensed */
+table.dataTable.table-condensed thead > tr > th {
+	padding-right: 20px;
+}
+
+table.dataTable.table-condensed thead .sorting:after,
+table.dataTable.table-condensed thead .sorting_asc:after,
+table.dataTable.table-condensed thead .sorting_desc:after {
+	top: 6px;
+	right: 6px;
+}
+
+/* Scrolling */
+div.dataTables_scrollHead table {
+	margin-bottom: 0 !important;
+	border-bottom-left-radius: 0;
+	border-bottom-right-radius: 0;
+}
+
+div.dataTables_scrollHead table thead tr:last-child th:first-child,
+div.dataTables_scrollHead table thead tr:last-child td:first-child {
+	border-bottom-left-radius: 0 !important;
+	border-bottom-right-radius: 0 !important;
+}
+
+div.dataTables_scrollBody table {
+	border-top: none;
+	margin-top: 0 !important;
+	margin-bottom: 0 !important;
+}
+
+div.dataTables_scrollBody tbody tr:first-child th,
+div.dataTables_scrollBody tbody tr:first-child td {
+	border-top: none;
+}
+
+div.dataTables_scrollFoot table {
+	margin-top: 0 !important;
+	border-top: none;
+}
+
+/* Frustratingly the border-collapse:collapse used by Bootstrap makes the column
+   width calculations when using scrolling impossible to align columns. We have
+   to use separate
+ */
+table.table-bordered.dataTable {
+	border-collapse: separate !important;
+}
+table.table-bordered thead th,
+table.table-bordered thead td {
+	border-left-width: 0;
+	border-top-width: 0;
+}
+table.table-bordered tbody th,
+table.table-bordered tbody td {
+	border-left-width: 0;
+	border-bottom-width: 0;
+}
+table.table-bordered tfoot th,
+table.table-bordered tfoot td {
+    border-left-width: 0;
+    border-bottom-width: 0;
+}
+table.table-bordered th:last-child,
+table.table-bordered td:last-child {
+	border-right-width: 0;
+}
+div.dataTables_scrollHead table.table-bordered {
+	border-bottom-width: 0;
+}
+
+
+
+
+/*
+ * TableTools styles
+ */
+.table.dataTable tbody tr.active td,
+.table.dataTable tbody tr.active th {
+	background-color: #08C;
+	color: white;
+}
+
+.table.dataTable tbody tr.active:hover td,
+.table.dataTable tbody tr.active:hover th {
+	background-color: #0075b0 !important;
+}
+
+.table.dataTable tbody tr.active th > a,
+.table.dataTable tbody tr.active td > a {
+	color: white;
+}
+
+.table-striped.dataTable tbody tr.active:nth-child(odd) td,
+.table-striped.dataTable tbody tr.active:nth-child(odd) th {
+	background-color: #017ebc;
+}
+
+table.DTTT_selectable tbody tr {
+	cursor: pointer;
+}
+
+div.DTTT .btn:hover {
+	text-decoration: none !important;
+}
+
+ul.DTTT_dropdown.dropdown-menu {
+  z-index: 2003;
+}
+
+ul.DTTT_dropdown.dropdown-menu a {
+	color: #333 !important; /* needed only when demo_page.css is included */
+}
+
+ul.DTTT_dropdown.dropdown-menu li {
+	position: relative;
+}
+
+ul.DTTT_dropdown.dropdown-menu li:hover a {
+	background-color: #0088cc;
+	color: white !important;
+}
+
+div.DTTT_collection_background {
+	z-index: 2002;	
+}
+
+/* TableTools information display */
+div.DTTT_print_info {
+	position: fixed;
+	top: 50%;
+	left: 50%;
+	width: 400px;
+	height: 150px;
+	margin-left: -200px;
+	margin-top: -75px;
+	text-align: center;
+	color: #333;
+	padding: 10px 30px;
+	opacity: 0.95;
+
+	background-color: white;
+	border: 1px solid rgba(0, 0, 0, 0.2);
+	border-radius: 6px;
+	
+	-webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.5);
+	        box-shadow: 0 3px 7px rgba(0, 0, 0, 0.5);
+}
+
+div.DTTT_print_info h6 {
+	font-weight: normal;
+	font-size: 28px;
+	line-height: 28px;
+	margin: 1em;
+}
+
+div.DTTT_print_info p {
+	font-size: 14px;
+	line-height: 20px;
+}
+
+div.dataTables_processing {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 100%;
+    height: 60px;
+    margin-left: -50%;
+    margin-top: -25px;
+    padding-top: 20px;
+    padding-bottom: 20px;
+    text-align: center;
+    font-size: 1.2em;
+    background-color: white;
+    background: -webkit-gradient(linear, left top, right top, color-stop(0%, rgba(255,255,255,0)), color-stop(25%, rgba(255,255,255,0.9)), color-stop(75%, rgba(255,255,255,0.9)), color-stop(100%, rgba(255,255,255,0)));
+    background: -webkit-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);
+    background: -moz-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);
+    background: -ms-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);
+    background: -o-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);
+    background: linear-gradient(to right, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);
+}
+
+
+
+/*
+ * FixedColumns styles
+ */
+div.DTFC_LeftHeadWrapper table,
+div.DTFC_LeftFootWrapper table,
+div.DTFC_RightHeadWrapper table,
+div.DTFC_RightFootWrapper table,
+table.DTFC_Cloned tr.even {
+    background-color: white;
+    margin-bottom: 0;
+}
+ 
+div.DTFC_RightHeadWrapper table ,
+div.DTFC_LeftHeadWrapper table {
+	border-bottom: none !important;
+    margin-bottom: 0 !important;
+    border-top-right-radius: 0 !important;
+    border-bottom-left-radius: 0 !important;
+    border-bottom-right-radius: 0 !important;
+}
+ 
+div.DTFC_RightHeadWrapper table thead tr:last-child th:first-child,
+div.DTFC_RightHeadWrapper table thead tr:last-child td:first-child,
+div.DTFC_LeftHeadWrapper table thead tr:last-child th:first-child,
+div.DTFC_LeftHeadWrapper table thead tr:last-child td:first-child {
+    border-bottom-left-radius: 0 !important;
+    border-bottom-right-radius: 0 !important;
+}
+ 
+div.DTFC_RightBodyWrapper table,
+div.DTFC_LeftBodyWrapper table {
+    border-top: none;
+    margin: 0 !important;
+}
+ 
+div.DTFC_RightBodyWrapper tbody tr:first-child th,
+div.DTFC_RightBodyWrapper tbody tr:first-child td,
+div.DTFC_LeftBodyWrapper tbody tr:first-child th,
+div.DTFC_LeftBodyWrapper tbody tr:first-child td {
+    border-top: none;
+}
+ 
+div.DTFC_RightFootWrapper table,
+div.DTFC_LeftFootWrapper table {
+    border-top: none;
+    margin-top: 0 !important;
+}
+
+
+div.DTFC_LeftBodyWrapper table.dataTable thead .sorting:after,
+div.DTFC_LeftBodyWrapper table.dataTable thead .sorting_asc:after,
+div.DTFC_LeftBodyWrapper table.dataTable thead .sorting_desc:after,
+div.DTFC_RightBodyWrapper table.dataTable thead .sorting:after,
+div.DTFC_RightBodyWrapper table.dataTable thead .sorting_asc:after,
+div.DTFC_RightBodyWrapper table.dataTable thead .sorting_desc:after {
+	display: none;
+}
+
+
+/*
+ * FixedHeader styles
+ */
+div.FixedHeader_Cloned table {
+	margin: 0 !important
+}
+
diff --git a/public/assets/plugins/datatables/dataTables.bootstrap.js b/public/assets/plugins/datatables/dataTables.bootstrap.js
new file mode 100644
index 00000000..dcc561fc
--- /dev/null
+++ b/public/assets/plugins/datatables/dataTables.bootstrap.js
@@ -0,0 +1,206 @@
+/*! DataTables Bootstrap 3 integration
+ * ©2011-2014 SpryMedia Ltd - datatables.net/license
+ */
+
+/**
+ * DataTables integration for Bootstrap 3. This requires Bootstrap 3 and
+ * DataTables 1.10 or newer.
+ *
+ * This file sets the defaults and adds options to DataTables to style its
+ * controls using Bootstrap. See http://datatables.net/manual/styling/bootstrap
+ * for further information.
+ */
+(function(window, document, undefined){
+
+var factory = function( $, DataTable ) {
+"use strict";
+
+
+/* Set the defaults for DataTables initialisation */
+$.extend( true, DataTable.defaults, {
+	dom:
+		"<'row'<'col-sm-6'l><'col-sm-6'f>>" +
+		"<'row'<'col-sm-12'tr>>" +
+		"<'row'<'col-sm-5'i><'col-sm-7'p>>",
+	renderer: 'bootstrap'
+} );
+
+
+/* Default class modification */
+$.extend( DataTable.ext.classes, {
+	sWrapper:      "dataTables_wrapper form-inline dt-bootstrap",
+	sFilterInput:  "form-control input-sm",
+	sLengthSelect: "form-control input-sm"
+} );
+
+
+/* Bootstrap paging button renderer */
+DataTable.ext.renderer.pageButton.bootstrap = function ( settings, host, idx, buttons, page, pages ) {
+	var api     = new DataTable.Api( settings );
+	var classes = settings.oClasses;
+	var lang    = settings.oLanguage.oPaginate;
+	var btnDisplay, btnClass, counter=0;
+
+	var attach = function( container, buttons ) {
+		var i, ien, node, button;
+		var clickHandler = function ( e ) {
+			e.preventDefault();
+			if ( !$(e.currentTarget).hasClass('disabled') ) {
+				api.page( e.data.action ).draw( false );
+			}
+		};
+
+		for ( i=0, ien=buttons.length ; i 0 ?
+							'' : ' disabled');
+						break;
+
+					case 'previous':
+						btnDisplay = lang.sPrevious;
+						btnClass = button + (page > 0 ?
+							'' : ' disabled');
+						break;
+
+					case 'next':
+						btnDisplay = lang.sNext;
+						btnClass = button + (page < pages-1 ?
+							'' : ' disabled');
+						break;
+
+					case 'last':
+						btnDisplay = lang.sLast;
+						btnClass = button + (page < pages-1 ?
+							'' : ' disabled');
+						break;
+
+					default:
+						btnDisplay = button + 1;
+						btnClass = page === button ?
+							'active' : '';
+						break;
+				}
+
+				if ( btnDisplay ) {
+					node = $('
  • ', {
+							'class': classes.sPageButton+' '+btnClass,
+							'id': idx === 0 && typeof button === 'string' ?
+								settings.sTableId +'_'+ button :
+								null
+						} )
+						.append( $('', {
+								'href': '#',
+								'aria-controls': settings.sTableId,
+								'data-dt-idx': counter,
+								'tabindex': settings.iTabIndex
+							} )
+							.html( btnDisplay )
+						)
+						.appendTo( container );
+
+					settings.oApi._fnBindAction(
+						node, {action: button}, clickHandler
+					);
+
+					counter++;
+				}
+			}
+		}
+	};
+
+	// IE9 throws an 'unknown error' if document.activeElement is used
+	// inside an iframe or frame. 
+	var activeEl;
+
+	try {
+		// Because this approach is destroying and recreating the paging
+		// elements, focus is lost on the select button which is bad for
+		// accessibility. So we want to restore focus once the draw has
+		// completed
+		activeEl = $(document.activeElement).data('dt-idx');
+	}
+	catch (e) {}
+
+	attach(
+		$(host).empty().html('
      ').children('ul'),
+		buttons
+	);
+
+	if ( activeEl ) {
+		$(host).find( '[data-dt-idx='+activeEl+']' ).focus();
+	}
+};
+
+
+/*
+ * TableTools Bootstrap compatibility
+ * Required TableTools 2.1+
+ */
+if ( DataTable.TableTools ) {
+	// Set the classes that TableTools uses to something suitable for Bootstrap
+	$.extend( true, DataTable.TableTools.classes, {
+		"container": "DTTT btn-group",
+		"buttons": {
+			"normal": "btn btn-default",
+			"disabled": "disabled"
+		},
+		"collection": {
+			"container": "DTTT_dropdown dropdown-menu",
+			"buttons": {
+				"normal": "",
+				"disabled": "disabled"
+			}
+		},
+		"print": {
+			"info": "DTTT_print_info"
+		},
+		"select": {
+			"row": "active"
+		}
+	} );
+
+	// Have the collection use a bootstrap compatible drop down
+	$.extend( true, DataTable.TableTools.DEFAULTS.oTags, {
+		"collection": {
+			"container": "ul",
+			"button": "li",
+			"liner": "a"
+		}
+	} );
+}
+
+}; // /factory
+
+
+// Define as an AMD module if possible
+if ( typeof define === 'function' && define.amd ) {
+	define( ['jquery', 'datatables'], factory );
+}
+else if ( typeof exports === 'object' ) {
+    // Node/CommonJS
+    factory( require('jquery'), require('datatables') );
+}
+else if ( jQuery ) {
+	// Otherwise simply initialise as normal, stopping multiple evaluation
+	factory( jQuery, jQuery.fn.dataTable );
+}
+
+
+})(window, document);
+
diff --git a/public/assets/plugins/datatables/dataTables.bootstrap.min.js b/public/assets/plugins/datatables/dataTables.bootstrap.min.js
new file mode 100644
index 00000000..85f7d062
--- /dev/null
+++ b/public/assets/plugins/datatables/dataTables.bootstrap.min.js
@@ -0,0 +1,8 @@
+/*!
+ DataTables Bootstrap 3 integration
+ ©2011-2014 SpryMedia Ltd - datatables.net/license
+*/
+(function(l,q){var e=function(b,c){b.extend(!0,c.defaults,{dom:"<'row'<'col-sm-6'l><'col-sm-6'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-5'i><'col-sm-7'p>>",renderer:"bootstrap"});b.extend(c.ext.classes,{sWrapper:"dataTables_wrapper form-inline dt-bootstrap",sFilterInput:"form-control input-sm",sLengthSelect:"form-control input-sm"});c.ext.renderer.pageButton.bootstrap=function(g,e,r,s,i,m){var t=new c.Api(g),u=g.oClasses,j=g.oLanguage.oPaginate,d,f,n=0,p=function(c,e){var k,h,o,a,l=function(a){a.preventDefault();
+b(a.currentTarget).hasClass("disabled")||t.page(a.data.action).draw(!1)};k=0;for(h=e.length;k",{"class":u.sPageButton+" "+
+f,id:0===r&&"string"===typeof a?g.sTableId+"_"+a:null}).append(b("",{href:"#","aria-controls":g.sTableId,"data-dt-idx":n,tabindex:g.iTabIndex}).html(d)).appendTo(c),g.oApi._fnBindAction(o,{action:a},l),n++)}},h;try{h=b(q.activeElement).data("dt-idx")}catch(l){}p(b(e).empty().html('
        ').children("ul"),s);h&&b(e).find("[data-dt-idx="+h+"]").focus()};c.TableTools&&(b.extend(!0,c.TableTools.classes,{container:"DTTT btn-group",buttons:{normal:"btn btn-default",disabled:"disabled"},
+collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:"disabled"}},print:{info:"DTTT_print_info"},select:{row:"active"}}),b.extend(!0,c.TableTools.DEFAULTS.oTags,{collection:{container:"ul",button:"li",liner:"a"}}))};"function"===typeof define&&define.amd?define(["jquery","datatables"],e):"object"===typeof exports?e(require("jquery"),require("datatables")):jQuery&&e(jQuery,jQuery.fn.dataTable)})(window,document);
diff --git a/public/assets/plugins/datatables/extensions/AutoFill/Readme.txt b/public/assets/plugins/datatables/extensions/AutoFill/Readme.txt
new file mode 100644
index 00000000..017d1d0d
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/AutoFill/Readme.txt
@@ -0,0 +1,38 @@
+# AutoFill
+
+AutoFill gives an Excel like option to a DataTable to click and drag over multiple cells, filling in information over the selected cells and incrementing numbers as needed. Key features include:
+
+* Click and drag cell content insertion
+* Automatic incrementing of numeric information
+* Enable and disable on any column
+* Detailed callback functions for customisation
+* Support for both DataTables and browser window scrolling
+
+
+# Installation
+
+To use AutoFill, first download DataTables ( http://datatables.net/download ) and place the unzipped AutoFill package into a `extensions` directory in the DataTables package. This will allow the pages in the examples to operate correctly. To see the examples running, open the `examples` directory in your web-browser.
+
+
+# Basic usage
+
+AutoFill is initialised using the `$.fn.dataTable.AutoFill` constructor. For example:
+
+```js
+$(document).ready( function () {
+    var table = $('#example').dataTable();
+    new $.fn.dataTable.AutoFill( table );
+} );
+```
+
+
+# Documentation / support
+
+* Documentation: http://datatables.net/extensions/autofill/
+* DataTables support forums: http://datatables.net/forums
+
+
+# GitHub
+
+If you fancy getting involved with the development of AutoFill and help make it better, please refer to its GitHub repo: https://github.com/DataTables/AutoFill
+
diff --git a/public/assets/plugins/datatables/extensions/AutoFill/css/dataTables.autoFill.css b/public/assets/plugins/datatables/extensions/AutoFill/css/dataTables.autoFill.css
new file mode 100644
index 00000000..cab59b3a
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/AutoFill/css/dataTables.autoFill.css
@@ -0,0 +1,24 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * AutoFill styles
+ */
+
+div.AutoFill_filler {
+	display: none;
+	position: absolute;
+	height: 14px;
+	width: 14px;
+	background: url(../images/filler.png) no-repeat center center;
+	z-index: 1002;
+}
+
+div.AutoFill_border {
+	display: none;
+	position: absolute;
+	background-color: #0063dc;
+	z-index: 1001;
+	
+	box-shadow: 0px 0px 5px #76b4ff;
+	-moz-box-shadow: 0px 0px 5px #76b4ff;
+	-webkit-box-shadow: 0px 0px 5px #76b4ff;
+}
+
diff --git a/public/assets/plugins/datatables/extensions/AutoFill/css/dataTables.autoFill.min.css b/public/assets/plugins/datatables/extensions/AutoFill/css/dataTables.autoFill.min.css
new file mode 100644
index 00000000..b485f216
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/AutoFill/css/dataTables.autoFill.min.css
@@ -0,0 +1 @@
+div.AutoFill_filler{display:none;position:absolute;height:14px;width:14px;background:url(../images/filler.png) no-repeat center center;z-index:1002}div.AutoFill_border{display:none;position:absolute;background-color:#0063dc;z-index:1001;box-shadow:0px 0px 5px #76b4ff;-moz-box-shadow:0px 0px 5px #76b4ff;-webkit-box-shadow:0px 0px 5px #76b4ff}
diff --git a/public/assets/plugins/datatables/extensions/AutoFill/examples/columns.html b/public/assets/plugins/datatables/extensions/AutoFill/examples/columns.html
new file mode 100644
index 00000000..d891b139
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/AutoFill/examples/columns.html
@@ -0,0 +1,644 @@
+
+
+
+	
+	
+	
+
+	AutoFill example - Column options
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
        
+		
        
+			
        AutoFill example Column options
        
+
+			
        
+				
        Columns can be enabled (which they are by default) and disabled from providing the end user with
+				AutoFill abilities by using either columns or columnDefs and the
+				enable option. These two arrays work in exactly the same way as in DataTables.
        
+
+				
        This example shows how disabling columns counting from the right hand side of the table can be
+				achieved. In this case, the last three columns.
        
+			
        
+
+			
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+				
+			
        NamePositionOfficeAgeStart dateSalary
        NamePositionOfficeAgeStart dateSalary
        Tiger NixonSystem ArchitectEdinburgh612011/04/25$320,800
        Garrett WintersAccountantTokyo632011/07/25$170,750
        Ashton CoxJunior Technical AuthorSan Francisco662009/01/12$86,000
        Cedric KellySenior Javascript DeveloperEdinburgh222012/03/29$433,060
        Airi SatouAccountantTokyo332008/11/28$162,700
        Brielle WilliamsonIntegration SpecialistNew York612012/12/02$372,000
        Herrod ChandlerSales AssistantSan Francisco592012/08/06$137,500
        Rhona DavidsonIntegration SpecialistTokyo552010/10/14$327,900
        Colleen HurstJavascript DeveloperSan Francisco392009/09/15$205,500
        Sonya FrostSoftware EngineerEdinburgh232008/12/13$103,600
        Jena GainesOffice ManagerLondon302008/12/19$90,560
        Quinn FlynnSupport LeadEdinburgh222013/03/03$342,000
        Charde MarshallRegional DirectorSan Francisco362008/10/16$470,600
        Haley KennedySenior Marketing DesignerLondon432012/12/18$313,500
        Tatyana FitzpatrickRegional DirectorLondon192010/03/17$385,750
        Michael SilvaMarketing DesignerLondon662012/11/27$198,500
        Paul ByrdChief Financial Officer (CFO)New York642010/06/09$725,000
        Gloria LittleSystems AdministratorNew York592009/04/10$237,500
        Bradley GreerSoftware EngineerLondon412012/10/13$132,000
        Dai RiosPersonnel LeadEdinburgh352012/09/26$217,500
        Jenette CaldwellDevelopment LeadNew York302011/09/03$345,000
        Yuri BerryChief Marketing Officer (CMO)New York402009/06/25$675,000
        Caesar VancePre-Sales SupportNew York212011/12/12$106,450
        Doris WilderSales AssistantSidney232010/09/20$85,600
        Angelica RamosChief Executive Officer (CEO)London472009/10/09$1,200,000
        Gavin JoyceDeveloperEdinburgh422010/12/22$92,575
        Jennifer ChangRegional DirectorSingapore282010/11/14$357,650
        Brenden WagnerSoftware EngineerSan Francisco282011/06/07$206,850
        Fiona GreenChief Operating Officer (COO)San Francisco482010/03/11$850,000
        Shou ItouRegional MarketingTokyo202011/08/14$163,000
        Michelle HouseIntegration SpecialistSidney372011/06/02$95,400
        Suki BurksDeveloperLondon532009/10/22$114,500
        Prescott BartlettTechnical AuthorLondon272011/05/07$145,000
        Gavin CortezTeam LeaderSan Francisco222008/10/26$235,500
        Martena MccrayPost-Sales supportEdinburgh462011/03/09$324,050
        Unity ButlerMarketing DesignerSan Francisco472009/12/09$85,675
        Howard HatfieldOffice ManagerSan Francisco512008/12/16$164,500
        Hope FuentesSecretarySan Francisco412010/02/12$109,850
        Vivian HarrellFinancial ControllerSan Francisco622009/02/14$452,500
        Timothy MooneyOffice ManagerLondon372008/12/11$136,200
        Jackson BradshawDirectorNew York652008/09/26$645,750
        Olivia LiangSupport EngineerSingapore642011/02/03$234,500
        Bruno NashSoftware EngineerLondon382011/05/03$163,500
        Sakura YamamotoSupport EngineerTokyo372009/08/19$139,575
        Thor WaltonDeveloperNew York612013/08/11$98,540
        Finn CamachoSupport EngineerSan Francisco472009/07/07$87,500
        Serge BaldwinData CoordinatorSingapore642012/04/09$138,575
        Zenaida FrankSoftware EngineerNew York632010/01/04$125,250
        Zorita SerranoSoftware EngineerSan Francisco562012/06/01$115,000
        Jennifer AcostaJunior Javascript DeveloperEdinburgh432013/02/01$75,650
        Cara StevensSales AssistantNew York462011/12/06$145,600
        Hermione ButlerRegional DirectorLondon472011/03/21$356,250
        Lael GreerSystems AdministratorLondon212009/02/27$103,500
        Jonas AlexanderDeveloperSan Francisco302010/07/14$86,500
        Shad DeckerRegional DirectorEdinburgh512008/11/13$183,000
        Michael BruceJavascript DeveloperSingapore292011/06/27$183,000
        Donna SniderCustomer SupportNew York272011/01/25$112,000
        
+
+			
          
+				
        • Javascript
          • 
+				
        • HTML
          • 
+				
        • CSS
          • 
+				
        • Ajax
          • 
+				
        • Server-side script
          • 
+			
        
+
+			
        
+				
        
+					
        The Javascript shown below is used to initialise the table shown in this
+					example:
        $(document).ready(function() {
+	var table = $('#example').dataTable();
+
+	new $.fn.dataTable.AutoFill( table, {
+		"columnDefs": [
+			{ enable:    false, targets: [-1, -2] },
+			{ increment: false, targets: 3 }
+		]
+	} );
+} );
+
+					
        In addition to the above code, the following Javascript library files are loaded for use in this
+					example:
        
+
+					
+				
        
+
+				
        
+					
        The HTML shown below is the raw HTML table element, before it has been enhanced by
+					DataTables:
        
+				
        
+
+				
        
+					
        
+						
        This example uses a little bit of additional CSS beyond what is loaded from the library
+						files (below), in order to correctly display the table. The additional CSS used is shown
+						below:
        
+					
        
+
+					
        The following CSS library files are loaded for use in this example to provide the styling of the
+					table:
        
+
+					
+				
        
+
+				
        
+					
        This table loads data by Ajax. The latest data that has been loaded is shown below. This data
+					will update automatically as any additional data is loaded.
        
+				
        
+
+				
        
+					
        The script used to perform the server-side processing for this table is shown below. Please note
+					that this is just an example script using PHP. Server-side processing scripts can be written in any
+					language, using the protocol described in the
+					DataTables documentation.
        
+				
        
+			
        
+		
        
+	
        
+
+	
        
+		
        
+			
        
+
+			
        
+				
        Other examples
        
+
+				
        
+					
        
+						
        Examples
        
+						
+					
        
+				
        
+
+				
        
+					
        Please refer to the DataTables documentation for full
+					information about its API properties and methods.
        
+					Additionally, there are a wide range of extras and
+					plug-ins which extend the capabilities of
+					DataTables.
        
+
+					
        DataTables designed and created by SpryMedia Ltd © 2007-2014
        
+					DataTables is licensed under the MIT license.
        
+				
        
+			
        
+		
        
+	
        
+
+
\ No newline at end of file
diff --git a/public/assets/plugins/datatables/extensions/AutoFill/examples/complete-callback.html b/public/assets/plugins/datatables/extensions/AutoFill/examples/complete-callback.html
new file mode 100644
index 00000000..2076d4f2
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/AutoFill/examples/complete-callback.html
@@ -0,0 +1,652 @@
+
+
+
+	
+	
+	
+
+	AutoFill example - Complete callback
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
        
+		
        
+			
        AutoFill example Complete callback
        
+
+			
        
+				
        AutoFill provides a number of customisable callback functions so you can tailor it's actions to
+				exactly what you need. This example shows the use of the complete callback function which
+				is executed at the end of an auto-fill drag, providing information about the cells that were
+				altered.
        
+
+				
        For a complete description of the complete callback, please refer to the AutoFill documentation.
        
+			
        
+
+			
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+				
+			
        NamePositionOfficeAgeStart dateSalary
        NamePositionOfficeAgeStart dateSalary
        Tiger NixonSystem ArchitectEdinburgh612011/04/25$320,800
        Garrett WintersAccountantTokyo632011/07/25$170,750
        Ashton CoxJunior Technical AuthorSan Francisco662009/01/12$86,000
        Cedric KellySenior Javascript DeveloperEdinburgh222012/03/29$433,060
        Airi SatouAccountantTokyo332008/11/28$162,700
        Brielle WilliamsonIntegration SpecialistNew York612012/12/02$372,000
        Herrod ChandlerSales AssistantSan Francisco592012/08/06$137,500
        Rhona DavidsonIntegration SpecialistTokyo552010/10/14$327,900
        Colleen HurstJavascript DeveloperSan Francisco392009/09/15$205,500
        Sonya FrostSoftware EngineerEdinburgh232008/12/13$103,600
        Jena GainesOffice ManagerLondon302008/12/19$90,560
        Quinn FlynnSupport LeadEdinburgh222013/03/03$342,000
        Charde MarshallRegional DirectorSan Francisco362008/10/16$470,600
        Haley KennedySenior Marketing DesignerLondon432012/12/18$313,500
        Tatyana FitzpatrickRegional DirectorLondon192010/03/17$385,750
        Michael SilvaMarketing DesignerLondon662012/11/27$198,500
        Paul ByrdChief Financial Officer (CFO)New York642010/06/09$725,000
        Gloria LittleSystems AdministratorNew York592009/04/10$237,500
        Bradley GreerSoftware EngineerLondon412012/10/13$132,000
        Dai RiosPersonnel LeadEdinburgh352012/09/26$217,500
        Jenette CaldwellDevelopment LeadNew York302011/09/03$345,000
        Yuri BerryChief Marketing Officer (CMO)New York402009/06/25$675,000
        Caesar VancePre-Sales SupportNew York212011/12/12$106,450
        Doris WilderSales AssistantSidney232010/09/20$85,600
        Angelica RamosChief Executive Officer (CEO)London472009/10/09$1,200,000
        Gavin JoyceDeveloperEdinburgh422010/12/22$92,575
        Jennifer ChangRegional DirectorSingapore282010/11/14$357,650
        Brenden WagnerSoftware EngineerSan Francisco282011/06/07$206,850
        Fiona GreenChief Operating Officer (COO)San Francisco482010/03/11$850,000
        Shou ItouRegional MarketingTokyo202011/08/14$163,000
        Michelle HouseIntegration SpecialistSidney372011/06/02$95,400
        Suki BurksDeveloperLondon532009/10/22$114,500
        Prescott BartlettTechnical AuthorLondon272011/05/07$145,000
        Gavin CortezTeam LeaderSan Francisco222008/10/26$235,500
        Martena MccrayPost-Sales supportEdinburgh462011/03/09$324,050
        Unity ButlerMarketing DesignerSan Francisco472009/12/09$85,675
        Howard HatfieldOffice ManagerSan Francisco512008/12/16$164,500
        Hope FuentesSecretarySan Francisco412010/02/12$109,850
        Vivian HarrellFinancial ControllerSan Francisco622009/02/14$452,500
        Timothy MooneyOffice ManagerLondon372008/12/11$136,200
        Jackson BradshawDirectorNew York652008/09/26$645,750
        Olivia LiangSupport EngineerSingapore642011/02/03$234,500
        Bruno NashSoftware EngineerLondon382011/05/03$163,500
        Sakura YamamotoSupport EngineerTokyo372009/08/19$139,575
        Thor WaltonDeveloperNew York612013/08/11$98,540
        Finn CamachoSupport EngineerSan Francisco472009/07/07$87,500
        Serge BaldwinData CoordinatorSingapore642012/04/09$138,575
        Zenaida FrankSoftware EngineerNew York632010/01/04$125,250
        Zorita SerranoSoftware EngineerSan Francisco562012/06/01$115,000
        Jennifer AcostaJunior Javascript DeveloperEdinburgh432013/02/01$75,650
        Cara StevensSales AssistantNew York462011/12/06$145,600
        Hermione ButlerRegional DirectorLondon472011/03/21$356,250
        Lael GreerSystems AdministratorLondon212009/02/27$103,500
        Jonas AlexanderDeveloperSan Francisco302010/07/14$86,500
        Shad DeckerRegional DirectorEdinburgh512008/11/13$183,000
        Michael BruceJavascript DeveloperSingapore292011/06/27$183,000
        Donna SniderCustomer SupportNew York272011/01/25$112,000
        
+
+			
          
+				
        • Javascript
          • 
+				
        • HTML
          • 
+				
        • CSS
          • 
+				
        • Ajax
          • 
+				
        • Server-side script
          • 
+			
        
+
+			
        
+				
        
+					
        The Javascript shown below is used to initialise the table shown in this
+					example:
        $(document).ready(function() {
+	var table = $('#example').dataTable();
+
+	new $.fn.dataTable.AutoFill( table, {
+		complete: function ( altered ) {
+			var last = altered[ altered.length-1 ];
+			alert( 
+				altered.length+' cells were altered in this auto-fill. The '+
+				'value of the last cell altered was: '+last.oldValue+' and is '+
+				'now '+last.newValue
+			);
+		}
+	} );
+} );
+
+					
        In addition to the above code, the following Javascript library files are loaded for use in this
+					example:
        
+
+					
+				
        
+
+				
        
+					
        The HTML shown below is the raw HTML table element, before it has been enhanced by
+					DataTables:
        
+				
        
+
+				
        
+					
        
+						
        This example uses a little bit of additional CSS beyond what is loaded from the library
+						files (below), in order to correctly display the table. The additional CSS used is shown
+						below:
        
+					
        
+
+					
        The following CSS library files are loaded for use in this example to provide the styling of the
+					table:
        
+
+					
+				
        
+
+				
        
+					
        This table loads data by Ajax. The latest data that has been loaded is shown below. This data
+					will update automatically as any additional data is loaded.
        
+				
        
+
+				
        
+					
        The script used to perform the server-side processing for this table is shown below. Please note
+					that this is just an example script using PHP. Server-side processing scripts can be written in any
+					language, using the protocol described in the
+					DataTables documentation.
        
+				
        
+			
        
+		
        
+	
        
+
+	
        
+		
        
+			
        
+
+			
        
+				
        Other examples
        
+
+				
        
+					
        
+						
        Examples
        
+						
+					
        
+				
        
+
+				
        
+					
        Please refer to the DataTables documentation for full
+					information about its API properties and methods.
        
+					Additionally, there are a wide range of extras and
+					plug-ins which extend the capabilities of
+					DataTables.
        
+
+					
        DataTables designed and created by SpryMedia Ltd © 2007-2014
        
+					DataTables is licensed under the MIT license.
        
+				
        
+			
        
+		
        
+	
        
+
+
\ No newline at end of file
diff --git a/public/assets/plugins/datatables/extensions/AutoFill/examples/fill-both.html b/public/assets/plugins/datatables/extensions/AutoFill/examples/fill-both.html
new file mode 100644
index 00000000..f65076e1
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/AutoFill/examples/fill-both.html
@@ -0,0 +1,641 @@
+
+
+
+	
+	
+	
+
+	AutoFill example - Horizontal and vertical fill
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
        
+		
        
+			
        AutoFill example Horizontal and vertical fill
        
+
+			
        
+				
        By default AutoFill will allow the fill to operate only on a single column at a time (i.e.
+				vertically). However, it has the ability to provide the fill either horizontally, over both axis or
+				limited to just one axis depending on the direction of the drag. This option is provided by the
+				mode sanitisation option.
        
+
+				
        In this case it is set to both (i.e. both horizontal and vertical axis) to provide the
+				filler along a row, rather than a column.
        
+
+				
        For the full range of options and syntax for mode please refer to the AutoFill documentation.
        
+			
        
+
+			
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+				
+			
        NamePositionOfficeAgeStart dateSalary
        NamePositionOfficeAgeStart dateSalary
        Tiger NixonSystem ArchitectEdinburgh612011/04/25$320,800
        Garrett WintersAccountantTokyo632011/07/25$170,750
        Ashton CoxJunior Technical AuthorSan Francisco662009/01/12$86,000
        Cedric KellySenior Javascript DeveloperEdinburgh222012/03/29$433,060
        Airi SatouAccountantTokyo332008/11/28$162,700
        Brielle WilliamsonIntegration SpecialistNew York612012/12/02$372,000
        Herrod ChandlerSales AssistantSan Francisco592012/08/06$137,500
        Rhona DavidsonIntegration SpecialistTokyo552010/10/14$327,900
        Colleen HurstJavascript DeveloperSan Francisco392009/09/15$205,500
        Sonya FrostSoftware EngineerEdinburgh232008/12/13$103,600
        Jena GainesOffice ManagerLondon302008/12/19$90,560
        Quinn FlynnSupport LeadEdinburgh222013/03/03$342,000
        Charde MarshallRegional DirectorSan Francisco362008/10/16$470,600
        Haley KennedySenior Marketing DesignerLondon432012/12/18$313,500
        Tatyana FitzpatrickRegional DirectorLondon192010/03/17$385,750
        Michael SilvaMarketing DesignerLondon662012/11/27$198,500
        Paul ByrdChief Financial Officer (CFO)New York642010/06/09$725,000
        Gloria LittleSystems AdministratorNew York592009/04/10$237,500
        Bradley GreerSoftware EngineerLondon412012/10/13$132,000
        Dai RiosPersonnel LeadEdinburgh352012/09/26$217,500
        Jenette CaldwellDevelopment LeadNew York302011/09/03$345,000
        Yuri BerryChief Marketing Officer (CMO)New York402009/06/25$675,000
        Caesar VancePre-Sales SupportNew York212011/12/12$106,450
        Doris WilderSales AssistantSidney232010/09/20$85,600
        Angelica RamosChief Executive Officer (CEO)London472009/10/09$1,200,000
        Gavin JoyceDeveloperEdinburgh422010/12/22$92,575
        Jennifer ChangRegional DirectorSingapore282010/11/14$357,650
        Brenden WagnerSoftware EngineerSan Francisco282011/06/07$206,850
        Fiona GreenChief Operating Officer (COO)San Francisco482010/03/11$850,000
        Shou ItouRegional MarketingTokyo202011/08/14$163,000
        Michelle HouseIntegration SpecialistSidney372011/06/02$95,400
        Suki BurksDeveloperLondon532009/10/22$114,500
        Prescott BartlettTechnical AuthorLondon272011/05/07$145,000
        Gavin CortezTeam LeaderSan Francisco222008/10/26$235,500
        Martena MccrayPost-Sales supportEdinburgh462011/03/09$324,050
        Unity ButlerMarketing DesignerSan Francisco472009/12/09$85,675
        Howard HatfieldOffice ManagerSan Francisco512008/12/16$164,500
        Hope FuentesSecretarySan Francisco412010/02/12$109,850
        Vivian HarrellFinancial ControllerSan Francisco622009/02/14$452,500
        Timothy MooneyOffice ManagerLondon372008/12/11$136,200
        Jackson BradshawDirectorNew York652008/09/26$645,750
        Olivia LiangSupport EngineerSingapore642011/02/03$234,500
        Bruno NashSoftware EngineerLondon382011/05/03$163,500
        Sakura YamamotoSupport EngineerTokyo372009/08/19$139,575
        Thor WaltonDeveloperNew York612013/08/11$98,540
        Finn CamachoSupport EngineerSan Francisco472009/07/07$87,500
        Serge BaldwinData CoordinatorSingapore642012/04/09$138,575
        Zenaida FrankSoftware EngineerNew York632010/01/04$125,250
        Zorita SerranoSoftware EngineerSan Francisco562012/06/01$115,000
        Jennifer AcostaJunior Javascript DeveloperEdinburgh432013/02/01$75,650
        Cara StevensSales AssistantNew York462011/12/06$145,600
        Hermione ButlerRegional DirectorLondon472011/03/21$356,250
        Lael GreerSystems AdministratorLondon212009/02/27$103,500
        Jonas AlexanderDeveloperSan Francisco302010/07/14$86,500
        Shad DeckerRegional DirectorEdinburgh512008/11/13$183,000
        Michael BruceJavascript DeveloperSingapore292011/06/27$183,000
        Donna SniderCustomer SupportNew York272011/01/25$112,000
        
+
+			
          
+				
        • Javascript
          • 
+				
        • HTML
          • 
+				
        • CSS
          • 
+				
        • Ajax
          • 
+				
        • Server-side script
          • 
+			
        
+
+			
        
+				
        
+					
        The Javascript shown below is used to initialise the table shown in this
+					example:
        $(document).ready(function() {
+	var table = $('#example').DataTable();
+
+	new $.fn.dataTable.AutoFill( table, {
+		mode: 'both'
+	} );
+} );
+
+					
        In addition to the above code, the following Javascript library files are loaded for use in this
+					example:
        
+
+					
+				
        
+
+				
        
+					
        The HTML shown below is the raw HTML table element, before it has been enhanced by
+					DataTables:
        
+				
        
+
+				
        
+					
        
+						
        This example uses a little bit of additional CSS beyond what is loaded from the library
+						files (below), in order to correctly display the table. The additional CSS used is shown
+						below:
        
+					
        
+
+					
        The following CSS library files are loaded for use in this example to provide the styling of the
+					table:
        
+
+					
+				
        
+
+				
        
+					
        This table loads data by Ajax. The latest data that has been loaded is shown below. This data
+					will update automatically as any additional data is loaded.
        
+				
        
+
+				
        
+					
        The script used to perform the server-side processing for this table is shown below. Please note
+					that this is just an example script using PHP. Server-side processing scripts can be written in any
+					language, using the protocol described in the
+					DataTables documentation.
        
+				
        
+			
        
+		
        
+	
        
+
+	
        
+		
        
+			
        
+
+			
        
+				
        Other examples
        
+
+				
        
+					
        
+						
        Examples
        
+						
+					
        
+				
        
+
+				
        
+					
        Please refer to the DataTables documentation for full
+					information about its API properties and methods.
        
+					Additionally, there are a wide range of extras and
+					plug-ins which extend the capabilities of
+					DataTables.
        
+
+					
        DataTables designed and created by SpryMedia Ltd © 2007-2014
        
+					DataTables is licensed under the MIT license.
        
+				
        
+			
        
+		
        
+	
        
+
+
\ No newline at end of file
diff --git a/public/assets/plugins/datatables/extensions/AutoFill/examples/fill-horizontal.html b/public/assets/plugins/datatables/extensions/AutoFill/examples/fill-horizontal.html
new file mode 100644
index 00000000..13cadac9
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/AutoFill/examples/fill-horizontal.html
@@ -0,0 +1,641 @@
+
+
+
+	
+	
+	
+
+	AutoFill example - Horizontal fill
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
        
+		
        
+			
        AutoFill example Horizontal fill
        
+
+			
        
+				
        By default AutoFill will allow the fill to operate only on a single column at a time (i.e.
+				vertically). However, it has the ability to provide the fill either horizontally, over both axis or
+				limited to just one axis depending on the direction of the drag. This option is provided by the
+				mode sanitisation option.
        
+
+				
        In this case it is set to x (i.e. horizontal axis) to provide the filler along a row,
+				rather than a column.
        
+
+				
        For the full range of options and syntax for mode please refer to the AutoFill documentation.
        
+			
        
+
+			
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+				
+			
        NamePositionOfficeAgeStart dateSalary
        NamePositionOfficeAgeStart dateSalary
        Tiger NixonSystem ArchitectEdinburgh612011/04/25$320,800
        Garrett WintersAccountantTokyo632011/07/25$170,750
        Ashton CoxJunior Technical AuthorSan Francisco662009/01/12$86,000
        Cedric KellySenior Javascript DeveloperEdinburgh222012/03/29$433,060
        Airi SatouAccountantTokyo332008/11/28$162,700
        Brielle WilliamsonIntegration SpecialistNew York612012/12/02$372,000
        Herrod ChandlerSales AssistantSan Francisco592012/08/06$137,500
        Rhona DavidsonIntegration SpecialistTokyo552010/10/14$327,900
        Colleen HurstJavascript DeveloperSan Francisco392009/09/15$205,500
        Sonya FrostSoftware EngineerEdinburgh232008/12/13$103,600
        Jena GainesOffice ManagerLondon302008/12/19$90,560
        Quinn FlynnSupport LeadEdinburgh222013/03/03$342,000
        Charde MarshallRegional DirectorSan Francisco362008/10/16$470,600
        Haley KennedySenior Marketing DesignerLondon432012/12/18$313,500
        Tatyana FitzpatrickRegional DirectorLondon192010/03/17$385,750
        Michael SilvaMarketing DesignerLondon662012/11/27$198,500
        Paul ByrdChief Financial Officer (CFO)New York642010/06/09$725,000
        Gloria LittleSystems AdministratorNew York592009/04/10$237,500
        Bradley GreerSoftware EngineerLondon412012/10/13$132,000
        Dai RiosPersonnel LeadEdinburgh352012/09/26$217,500
        Jenette CaldwellDevelopment LeadNew York302011/09/03$345,000
        Yuri BerryChief Marketing Officer (CMO)New York402009/06/25$675,000
        Caesar VancePre-Sales SupportNew York212011/12/12$106,450
        Doris WilderSales AssistantSidney232010/09/20$85,600
        Angelica RamosChief Executive Officer (CEO)London472009/10/09$1,200,000
        Gavin JoyceDeveloperEdinburgh422010/12/22$92,575
        Jennifer ChangRegional DirectorSingapore282010/11/14$357,650
        Brenden WagnerSoftware EngineerSan Francisco282011/06/07$206,850
        Fiona GreenChief Operating Officer (COO)San Francisco482010/03/11$850,000
        Shou ItouRegional MarketingTokyo202011/08/14$163,000
        Michelle HouseIntegration SpecialistSidney372011/06/02$95,400
        Suki BurksDeveloperLondon532009/10/22$114,500
        Prescott BartlettTechnical AuthorLondon272011/05/07$145,000
        Gavin CortezTeam LeaderSan Francisco222008/10/26$235,500
        Martena MccrayPost-Sales supportEdinburgh462011/03/09$324,050
        Unity ButlerMarketing DesignerSan Francisco472009/12/09$85,675
        Howard HatfieldOffice ManagerSan Francisco512008/12/16$164,500
        Hope FuentesSecretarySan Francisco412010/02/12$109,850
        Vivian HarrellFinancial ControllerSan Francisco622009/02/14$452,500
        Timothy MooneyOffice ManagerLondon372008/12/11$136,200
        Jackson BradshawDirectorNew York652008/09/26$645,750
        Olivia LiangSupport EngineerSingapore642011/02/03$234,500
        Bruno NashSoftware EngineerLondon382011/05/03$163,500
        Sakura YamamotoSupport EngineerTokyo372009/08/19$139,575
        Thor WaltonDeveloperNew York612013/08/11$98,540
        Finn CamachoSupport EngineerSan Francisco472009/07/07$87,500
        Serge BaldwinData CoordinatorSingapore642012/04/09$138,575
        Zenaida FrankSoftware EngineerNew York632010/01/04$125,250
        Zorita SerranoSoftware EngineerSan Francisco562012/06/01$115,000
        Jennifer AcostaJunior Javascript DeveloperEdinburgh432013/02/01$75,650
        Cara StevensSales AssistantNew York462011/12/06$145,600
        Hermione ButlerRegional DirectorLondon472011/03/21$356,250
        Lael GreerSystems AdministratorLondon212009/02/27$103,500
        Jonas AlexanderDeveloperSan Francisco302010/07/14$86,500
        Shad DeckerRegional DirectorEdinburgh512008/11/13$183,000
        Michael BruceJavascript DeveloperSingapore292011/06/27$183,000
        Donna SniderCustomer SupportNew York272011/01/25$112,000
        
+
+			
          
+				
        • Javascript
          • 
+				
        • HTML
          • 
+				
        • CSS
          • 
+				
        • Ajax
          • 
+				
        • Server-side script
          • 
+			
        
+
+			
        
+				
        
+					
        The Javascript shown below is used to initialise the table shown in this
+					example:
        $(document).ready(function() {
+	var table = $('#example').DataTable();
+
+	new $.fn.dataTable.AutoFill( table, {
+		mode: 'x'
+	} );
+} );
+
+					
        In addition to the above code, the following Javascript library files are loaded for use in this
+					example:
        
+
+					
+				
        
+
+				
        
+					
        The HTML shown below is the raw HTML table element, before it has been enhanced by
+					DataTables:
        
+				
        
+
+				
        
+					
        
+						
        This example uses a little bit of additional CSS beyond what is loaded from the library
+						files (below), in order to correctly display the table. The additional CSS used is shown
+						below:
        
+					
        
+
+					
        The following CSS library files are loaded for use in this example to provide the styling of the
+					table:
        
+
+					
+				
        
+
+				
        
+					
        This table loads data by Ajax. The latest data that has been loaded is shown below. This data
+					will update automatically as any additional data is loaded.
        
+				
        
+
+				
        
+					
        The script used to perform the server-side processing for this table is shown below. Please note
+					that this is just an example script using PHP. Server-side processing scripts can be written in any
+					language, using the protocol described in the
+					DataTables documentation.
        
+				
        
+			
        
+		
        
+	
        
+
+	
        
+		
        
+			
        
+
+			
        
+				
        Other examples
        
+
+				
        
+					
        
+						
        Examples
        
+						
+					
        
+				
        
+
+				
        
+					
        Please refer to the DataTables documentation for full
+					information about its API properties and methods.
        
+					Additionally, there are a wide range of extras and
+					plug-ins which extend the capabilities of
+					DataTables.
        
+
+					
        DataTables designed and created by SpryMedia Ltd © 2007-2014
        
+					DataTables is licensed under the MIT license.
        
+				
        
+			
        
+		
        
+	
        
+
+
\ No newline at end of file
diff --git a/public/assets/plugins/datatables/extensions/AutoFill/examples/index.html b/public/assets/plugins/datatables/extensions/AutoFill/examples/index.html
new file mode 100644
index 00000000..9cade86c
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/AutoFill/examples/index.html
@@ -0,0 +1,66 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	AutoFill examples - AutoFill examples
+
+
+
+	
        
+		
        
+			
        AutoFill example AutoFill examples
        
+
+			
        
+				
        AutoFill gives an Excel like option to a DataTable to click and drag over multiple cells, filling in
+				information over the selected cells and incrementing numbers as needed.
        
+
+				
        Thanks to Phoniax AS for their sponsorship of this plug-in for
+				DataTables.
        
+			
        
+		
        
+	
        
+
+	
        
+		
        
+			
        
+
+			
        
+				
        
+					
        
+						
        Examples
        
+						
+					
        
+				
        
+
+				
        
+					
        Please refer to the DataTables documentation for full
+					information about its API properties and methods.
        
+					Additionally, there are a wide range of extras and
+					plug-ins which extend the capabilities of
+					DataTables.
        
+
+					
        DataTables designed and created by SpryMedia Ltd © 2007-2014
        
+					DataTables is licensed under the MIT license.
        
+				
        
+			
        
+		
        
+	
        
+
+
\ No newline at end of file
diff --git a/public/assets/plugins/datatables/extensions/AutoFill/examples/scrolling.html b/public/assets/plugins/datatables/extensions/AutoFill/examples/scrolling.html
new file mode 100644
index 00000000..66871ec7
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/AutoFill/examples/scrolling.html
@@ -0,0 +1,638 @@
+
+
+
+	
+	
+	
+
+	AutoFill example - Scrolling DataTable
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
        
+		
        
+			
        AutoFill example Scrolling DataTable
        
+
+			
        
+				
        When dragging an AutoFill handle, the table (if DataTables scrolling is enabled) or the window will
+				be automatically scrolled, as you approach the edge of the scrolling component. The example below shows
+				the effect with DataTables scrolling (and also window if needed).
        
+			
        
+
+			
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+				
+			
        NamePositionOfficeAgeStart dateSalary
        NamePositionOfficeAgeStart dateSalary
        Tiger NixonSystem ArchitectEdinburgh612011/04/25$320,800
        Garrett WintersAccountantTokyo632011/07/25$170,750
        Ashton CoxJunior Technical AuthorSan Francisco662009/01/12$86,000
        Cedric KellySenior Javascript DeveloperEdinburgh222012/03/29$433,060
        Airi SatouAccountantTokyo332008/11/28$162,700
        Brielle WilliamsonIntegration SpecialistNew York612012/12/02$372,000
        Herrod ChandlerSales AssistantSan Francisco592012/08/06$137,500
        Rhona DavidsonIntegration SpecialistTokyo552010/10/14$327,900
        Colleen HurstJavascript DeveloperSan Francisco392009/09/15$205,500
        Sonya FrostSoftware EngineerEdinburgh232008/12/13$103,600
        Jena GainesOffice ManagerLondon302008/12/19$90,560
        Quinn FlynnSupport LeadEdinburgh222013/03/03$342,000
        Charde MarshallRegional DirectorSan Francisco362008/10/16$470,600
        Haley KennedySenior Marketing DesignerLondon432012/12/18$313,500
        Tatyana FitzpatrickRegional DirectorLondon192010/03/17$385,750
        Michael SilvaMarketing DesignerLondon662012/11/27$198,500
        Paul ByrdChief Financial Officer (CFO)New York642010/06/09$725,000
        Gloria LittleSystems AdministratorNew York592009/04/10$237,500
        Bradley GreerSoftware EngineerLondon412012/10/13$132,000
        Dai RiosPersonnel LeadEdinburgh352012/09/26$217,500
        Jenette CaldwellDevelopment LeadNew York302011/09/03$345,000
        Yuri BerryChief Marketing Officer (CMO)New York402009/06/25$675,000
        Caesar VancePre-Sales SupportNew York212011/12/12$106,450
        Doris WilderSales AssistantSidney232010/09/20$85,600
        Angelica RamosChief Executive Officer (CEO)London472009/10/09$1,200,000
        Gavin JoyceDeveloperEdinburgh422010/12/22$92,575
        Jennifer ChangRegional DirectorSingapore282010/11/14$357,650
        Brenden WagnerSoftware EngineerSan Francisco282011/06/07$206,850
        Fiona GreenChief Operating Officer (COO)San Francisco482010/03/11$850,000
        Shou ItouRegional MarketingTokyo202011/08/14$163,000
        Michelle HouseIntegration SpecialistSidney372011/06/02$95,400
        Suki BurksDeveloperLondon532009/10/22$114,500
        Prescott BartlettTechnical AuthorLondon272011/05/07$145,000
        Gavin CortezTeam LeaderSan Francisco222008/10/26$235,500
        Martena MccrayPost-Sales supportEdinburgh462011/03/09$324,050
        Unity ButlerMarketing DesignerSan Francisco472009/12/09$85,675
        Howard HatfieldOffice ManagerSan Francisco512008/12/16$164,500
        Hope FuentesSecretarySan Francisco412010/02/12$109,850
        Vivian HarrellFinancial ControllerSan Francisco622009/02/14$452,500
        Timothy MooneyOffice ManagerLondon372008/12/11$136,200
        Jackson BradshawDirectorNew York652008/09/26$645,750
        Olivia LiangSupport EngineerSingapore642011/02/03$234,500
        Bruno NashSoftware EngineerLondon382011/05/03$163,500
        Sakura YamamotoSupport EngineerTokyo372009/08/19$139,575
        Thor WaltonDeveloperNew York612013/08/11$98,540
        Finn CamachoSupport EngineerSan Francisco472009/07/07$87,500
        Serge BaldwinData CoordinatorSingapore642012/04/09$138,575
        Zenaida FrankSoftware EngineerNew York632010/01/04$125,250
        Zorita SerranoSoftware EngineerSan Francisco562012/06/01$115,000
        Jennifer AcostaJunior Javascript DeveloperEdinburgh432013/02/01$75,650
        Cara StevensSales AssistantNew York462011/12/06$145,600
        Hermione ButlerRegional DirectorLondon472011/03/21$356,250
        Lael GreerSystems AdministratorLondon212009/02/27$103,500
        Jonas AlexanderDeveloperSan Francisco302010/07/14$86,500
        Shad DeckerRegional DirectorEdinburgh512008/11/13$183,000
        Michael BruceJavascript DeveloperSingapore292011/06/27$183,000
        Donna SniderCustomer SupportNew York272011/01/25$112,000
        
+
+			
          
+				
        • Javascript
          • 
+				
        • HTML
          • 
+				
        • CSS
          • 
+				
        • Ajax
          • 
+				
        • Server-side script
          • 
+			
        
+
+			
        
+				
        
+					
        The Javascript shown below is used to initialise the table shown in this
+					example:
        $(document).ready(function() {
+	var table = $('#example').dataTable( {
+		scrollY: 200,
+		scrollCollapse: false,
+		paginate: false
+	} );
+
+	new $.fn.dataTable.AutoFill( table );
+} );
+
+					
        In addition to the above code, the following Javascript library files are loaded for use in this
+					example:
        
+
+					
+				
        
+
+				
        
+					
        The HTML shown below is the raw HTML table element, before it has been enhanced by
+					DataTables:
        
+				
        
+
+				
        
+					
        
+						
        This example uses a little bit of additional CSS beyond what is loaded from the library
+						files (below), in order to correctly display the table. The additional CSS used is shown
+						below:
        
+					
        
+
+					
        The following CSS library files are loaded for use in this example to provide the styling of the
+					table:
        
+
+					
+				
        
+
+				
        
+					
        This table loads data by Ajax. The latest data that has been loaded is shown below. This data
+					will update automatically as any additional data is loaded.
        
+				
        
+
+				
        
+					
        The script used to perform the server-side processing for this table is shown below. Please note
+					that this is just an example script using PHP. Server-side processing scripts can be written in any
+					language, using the protocol described in the
+					DataTables documentation.
        
+				
        
+			
        
+		
        
+	
        
+
+	
        
+		
        
+			
        
+
+			
        
+				
        Other examples
        
+
+				
        
+					
        
+						
        Examples
        
+						
+					
        
+				
        
+
+				
        
+					
        Please refer to the DataTables documentation for full
+					information about its API properties and methods.
        
+					Additionally, there are a wide range of extras and
+					plug-ins which extend the capabilities of
+					DataTables.
        
+
+					
        DataTables designed and created by SpryMedia Ltd © 2007-2014
        
+					DataTables is licensed under the MIT license.
        
+				
        
+			
        
+		
        
+	
        
+
+
\ No newline at end of file
diff --git a/public/assets/plugins/datatables/extensions/AutoFill/examples/simple.html b/public/assets/plugins/datatables/extensions/AutoFill/examples/simple.html
new file mode 100644
index 00000000..ea3db498
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/AutoFill/examples/simple.html
@@ -0,0 +1,631 @@
+
+
+
+	
+	
+	
+
+	AutoFill example - Basic initialisation
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
        
+		
        
+			
        AutoFill example Basic initialisation
        
+
+			
        
+				
        AutoFill gives an Excel like option to a DataTable to click and drag over multiple cells, filling in
+				information over the selected cells and incrementing numbers as needed.
        
+
+				
        AutoFill is initialised using the $.fn.dataTable.AutoFill function as shown in the
+				example below. It requires one parameter, the DataTable instance that AutoFill is to operate on, and
+				optionally a second configuration parameter, which is shown in the other AutoFill examples.
        
+			
        
+
+			
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+				
+			
        NamePositionOfficeAgeStart dateSalary
        NamePositionOfficeAgeStart dateSalary
        Tiger NixonSystem ArchitectEdinburgh612011/04/25$320,800
        Garrett WintersAccountantTokyo632011/07/25$170,750
        Ashton CoxJunior Technical AuthorSan Francisco662009/01/12$86,000
        Cedric KellySenior Javascript DeveloperEdinburgh222012/03/29$433,060
        Airi SatouAccountantTokyo332008/11/28$162,700
        Brielle WilliamsonIntegration SpecialistNew York612012/12/02$372,000
        Herrod ChandlerSales AssistantSan Francisco592012/08/06$137,500
        Rhona DavidsonIntegration SpecialistTokyo552010/10/14$327,900
        Colleen HurstJavascript DeveloperSan Francisco392009/09/15$205,500
        Sonya FrostSoftware EngineerEdinburgh232008/12/13$103,600
        Jena GainesOffice ManagerLondon302008/12/19$90,560
        Quinn FlynnSupport LeadEdinburgh222013/03/03$342,000
        Charde MarshallRegional DirectorSan Francisco362008/10/16$470,600
        Haley KennedySenior Marketing DesignerLondon432012/12/18$313,500
        Tatyana FitzpatrickRegional DirectorLondon192010/03/17$385,750
        Michael SilvaMarketing DesignerLondon662012/11/27$198,500
        Paul ByrdChief Financial Officer (CFO)New York642010/06/09$725,000
        Gloria LittleSystems AdministratorNew York592009/04/10$237,500
        Bradley GreerSoftware EngineerLondon412012/10/13$132,000
        Dai RiosPersonnel LeadEdinburgh352012/09/26$217,500
        Jenette CaldwellDevelopment LeadNew York302011/09/03$345,000
        Yuri BerryChief Marketing Officer (CMO)New York402009/06/25$675,000
        Caesar VancePre-Sales SupportNew York212011/12/12$106,450
        Doris WilderSales AssistantSidney232010/09/20$85,600
        Angelica RamosChief Executive Officer (CEO)London472009/10/09$1,200,000
        Gavin JoyceDeveloperEdinburgh422010/12/22$92,575
        Jennifer ChangRegional DirectorSingapore282010/11/14$357,650
        Brenden WagnerSoftware EngineerSan Francisco282011/06/07$206,850
        Fiona GreenChief Operating Officer (COO)San Francisco482010/03/11$850,000
        Shou ItouRegional MarketingTokyo202011/08/14$163,000
        Michelle HouseIntegration SpecialistSidney372011/06/02$95,400
        Suki BurksDeveloperLondon532009/10/22$114,500
        Prescott BartlettTechnical AuthorLondon272011/05/07$145,000
        Gavin CortezTeam LeaderSan Francisco222008/10/26$235,500
        Martena MccrayPost-Sales supportEdinburgh462011/03/09$324,050
        Unity ButlerMarketing DesignerSan Francisco472009/12/09$85,675
        Howard HatfieldOffice ManagerSan Francisco512008/12/16$164,500
        Hope FuentesSecretarySan Francisco412010/02/12$109,850
        Vivian HarrellFinancial ControllerSan Francisco622009/02/14$452,500
        Timothy MooneyOffice ManagerLondon372008/12/11$136,200
        Jackson BradshawDirectorNew York652008/09/26$645,750
        Olivia LiangSupport EngineerSingapore642011/02/03$234,500
        Bruno NashSoftware EngineerLondon382011/05/03$163,500
        Sakura YamamotoSupport EngineerTokyo372009/08/19$139,575
        Thor WaltonDeveloperNew York612013/08/11$98,540
        Finn CamachoSupport EngineerSan Francisco472009/07/07$87,500
        Serge BaldwinData CoordinatorSingapore642012/04/09$138,575
        Zenaida FrankSoftware EngineerNew York632010/01/04$125,250
        Zorita SerranoSoftware EngineerSan Francisco562012/06/01$115,000
        Jennifer AcostaJunior Javascript DeveloperEdinburgh432013/02/01$75,650
        Cara StevensSales AssistantNew York462011/12/06$145,600
        Hermione ButlerRegional DirectorLondon472011/03/21$356,250
        Lael GreerSystems AdministratorLondon212009/02/27$103,500
        Jonas AlexanderDeveloperSan Francisco302010/07/14$86,500
        Shad DeckerRegional DirectorEdinburgh512008/11/13$183,000
        Michael BruceJavascript DeveloperSingapore292011/06/27$183,000
        Donna SniderCustomer SupportNew York272011/01/25$112,000
        
+
+			
          
+				
        • Javascript
          • 
+				
        • HTML
          • 
+				
        • CSS
          • 
+				
        • Ajax
          • 
+				
        • Server-side script
          • 
+			
        
+
+			
        
+				
        
+					
        The Javascript shown below is used to initialise the table shown in this
+					example:
        $(document).ready(function() {
+	var table = $('#example').DataTable();
+	new $.fn.dataTable.AutoFill( table );
+} );
+
+					
        In addition to the above code, the following Javascript library files are loaded for use in this
+					example:
        
+
+					
+				
        
+
+				
        
+					
        The HTML shown below is the raw HTML table element, before it has been enhanced by
+					DataTables:
        
+				
        
+
+				
        
+					
        
+						
        This example uses a little bit of additional CSS beyond what is loaded from the library
+						files (below), in order to correctly display the table. The additional CSS used is shown
+						below:
        
+					
        
+
+					
        The following CSS library files are loaded for use in this example to provide the styling of the
+					table:
        
+
+					
+				
        
+
+				
        
+					
        This table loads data by Ajax. The latest data that has been loaded is shown below. This data
+					will update automatically as any additional data is loaded.
        
+				
        
+
+				
        
+					
        The script used to perform the server-side processing for this table is shown below. Please note
+					that this is just an example script using PHP. Server-side processing scripts can be written in any
+					language, using the protocol described in the
+					DataTables documentation.
        
+				
        
+			
        
+		
        
+	
        
+
+	
        
+		
        
+			
        
+
+			
        
+				
        Other examples
        
+
+				
        
+					
        
+						
        Examples
        
+						
+					
        
+				
        
+
+				
        
+					
        Please refer to the DataTables documentation for full
+					information about its API properties and methods.
        
+					Additionally, there are a wide range of extras and
+					plug-ins which extend the capabilities of
+					DataTables.
        
+
+					
        DataTables designed and created by SpryMedia Ltd © 2007-2014
        
+					DataTables is licensed under the MIT license.
        
+				
        
+			
        
+		
        
+	
        
+
+
\ No newline at end of file
diff --git a/public/assets/plugins/datatables/extensions/AutoFill/examples/step-callback.html b/public/assets/plugins/datatables/extensions/AutoFill/examples/step-callback.html
new file mode 100644
index 00000000..c1255aaa
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/AutoFill/examples/step-callback.html
@@ -0,0 +1,660 @@
+
+
+
+	
+	
+	
+
+	AutoFill example - Step callback
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
        
+		
        
+			
        AutoFill example Step callback
        
+
+			
        
+				
        By default, AutoFill will increment cells that contain numbers by a single digit for each cell that
+				is iterated over (try the Age column below for example). This behaviour can be disabled
+				completely using the increment column option, but it can also be modified to suit your
+				requirements through use of the step column callback function.
        
+
+				
        The step callback is executed for each cell in the auto-fill set and gives complete
+				control over how data is incremented. The example below shows the step function being used on the
+				Salary column to increment by 100, rather than 1 for each cell.
        
+
+				
        For a complete description of the step callback, please refer to the AutoFill documentation.
        
+			
        
+
+			
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+				
+			
        NamePositionOfficeAgeStart dateSalary
        NamePositionOfficeAgeStart dateSalary
        Tiger NixonSystem ArchitectEdinburgh612011/04/25$320,800
        Garrett WintersAccountantTokyo632011/07/25$170,750
        Ashton CoxJunior Technical AuthorSan Francisco662009/01/12$86,000
        Cedric KellySenior Javascript DeveloperEdinburgh222012/03/29$433,060
        Airi SatouAccountantTokyo332008/11/28$162,700
        Brielle WilliamsonIntegration SpecialistNew York612012/12/02$372,000
        Herrod ChandlerSales AssistantSan Francisco592012/08/06$137,500
        Rhona DavidsonIntegration SpecialistTokyo552010/10/14$327,900
        Colleen HurstJavascript DeveloperSan Francisco392009/09/15$205,500
        Sonya FrostSoftware EngineerEdinburgh232008/12/13$103,600
        Jena GainesOffice ManagerLondon302008/12/19$90,560
        Quinn FlynnSupport LeadEdinburgh222013/03/03$342,000
        Charde MarshallRegional DirectorSan Francisco362008/10/16$470,600
        Haley KennedySenior Marketing DesignerLondon432012/12/18$313,500
        Tatyana FitzpatrickRegional DirectorLondon192010/03/17$385,750
        Michael SilvaMarketing DesignerLondon662012/11/27$198,500
        Paul ByrdChief Financial Officer (CFO)New York642010/06/09$725,000
        Gloria LittleSystems AdministratorNew York592009/04/10$237,500
        Bradley GreerSoftware EngineerLondon412012/10/13$132,000
        Dai RiosPersonnel LeadEdinburgh352012/09/26$217,500
        Jenette CaldwellDevelopment LeadNew York302011/09/03$345,000
        Yuri BerryChief Marketing Officer (CMO)New York402009/06/25$675,000
        Caesar VancePre-Sales SupportNew York212011/12/12$106,450
        Doris WilderSales AssistantSidney232010/09/20$85,600
        Angelica RamosChief Executive Officer (CEO)London472009/10/09$1,200,000
        Gavin JoyceDeveloperEdinburgh422010/12/22$92,575
        Jennifer ChangRegional DirectorSingapore282010/11/14$357,650
        Brenden WagnerSoftware EngineerSan Francisco282011/06/07$206,850
        Fiona GreenChief Operating Officer (COO)San Francisco482010/03/11$850,000
        Shou ItouRegional MarketingTokyo202011/08/14$163,000
        Michelle HouseIntegration SpecialistSidney372011/06/02$95,400
        Suki BurksDeveloperLondon532009/10/22$114,500
        Prescott BartlettTechnical AuthorLondon272011/05/07$145,000
        Gavin CortezTeam LeaderSan Francisco222008/10/26$235,500
        Martena MccrayPost-Sales supportEdinburgh462011/03/09$324,050
        Unity ButlerMarketing DesignerSan Francisco472009/12/09$85,675
        Howard HatfieldOffice ManagerSan Francisco512008/12/16$164,500
        Hope FuentesSecretarySan Francisco412010/02/12$109,850
        Vivian HarrellFinancial ControllerSan Francisco622009/02/14$452,500
        Timothy MooneyOffice ManagerLondon372008/12/11$136,200
        Jackson BradshawDirectorNew York652008/09/26$645,750
        Olivia LiangSupport EngineerSingapore642011/02/03$234,500
        Bruno NashSoftware EngineerLondon382011/05/03$163,500
        Sakura YamamotoSupport EngineerTokyo372009/08/19$139,575
        Thor WaltonDeveloperNew York612013/08/11$98,540
        Finn CamachoSupport EngineerSan Francisco472009/07/07$87,500
        Serge BaldwinData CoordinatorSingapore642012/04/09$138,575
        Zenaida FrankSoftware EngineerNew York632010/01/04$125,250
        Zorita SerranoSoftware EngineerSan Francisco562012/06/01$115,000
        Jennifer AcostaJunior Javascript DeveloperEdinburgh432013/02/01$75,650
        Cara StevensSales AssistantNew York462011/12/06$145,600
        Hermione ButlerRegional DirectorLondon472011/03/21$356,250
        Lael GreerSystems AdministratorLondon212009/02/27$103,500
        Jonas AlexanderDeveloperSan Francisco302010/07/14$86,500
        Shad DeckerRegional DirectorEdinburgh512008/11/13$183,000
        Michael BruceJavascript DeveloperSingapore292011/06/27$183,000
        Donna SniderCustomer SupportNew York272011/01/25$112,000
        
+
+			
          
+				
        • Javascript
          • 
+				
        • HTML
          • 
+				
        • CSS
          • 
+				
        • Ajax
          • 
+				
        • Server-side script
          • 
+			
        
+
+			
        
+				
        
+					
        The Javascript shown below is used to initialise the table shown in this
+					example:
        $(document).ready(function() {
+	var table = $('#example').dataTable();
+
+	new $.fn.dataTable.AutoFill( table, {
+		columnDefs: [ {
+			targets: -1,
+			step: function ( cell, read, last, i, x, y ) {
+				var val = parseInt( (last || read).replace(/[$,]/g, ''), 10 );
+				val += (x<0 || y<0 ? -100 : 100); // - if going back up, + if going down
+
+				// Format for the currency column
+				return '$'+val.toString().replace( /\B(?=(\d{3})+(?!\d))/g, ',' );
+			}
+		} ]
+	} );
+} );
+
+					
        In addition to the above code, the following Javascript library files are loaded for use in this
+					example:
        
+
+					
+				
        
+
+				
        
+					
        The HTML shown below is the raw HTML table element, before it has been enhanced by
+					DataTables:
        
+				
        
+
+				
        
+					
        
+						
        This example uses a little bit of additional CSS beyond what is loaded from the library
+						files (below), in order to correctly display the table. The additional CSS used is shown
+						below:
        
+					
        
+
+					
        The following CSS library files are loaded for use in this example to provide the styling of the
+					table:
        
+
+					
+				
        
+
+				
        
+					
        This table loads data by Ajax. The latest data that has been loaded is shown below. This data
+					will update automatically as any additional data is loaded.
        
+				
        
+
+				
        
+					
        The script used to perform the server-side processing for this table is shown below. Please note
+					that this is just an example script using PHP. Server-side processing scripts can be written in any
+					language, using the protocol described in the
+					DataTables documentation.
        
+				
        
+			
        
+		
        
+	
        
+
+	
        
+		
        
+			
        
+
+			
        
+				
        Other examples
        
+
+				
        
+					
        
+						
        Examples
        
+						
+					
        
+				
        
+
+				
        
+					
        Please refer to the DataTables documentation for full
+					information about its API properties and methods.
        
+					Additionally, there are a wide range of extras and
+					plug-ins which extend the capabilities of
+					DataTables.
        
+
+					
        DataTables designed and created by SpryMedia Ltd © 2007-2014
        
+					DataTables is licensed under the MIT license.
        
+				
        
+			
        
+		
        
+	
        
+
+
\ No newline at end of file
diff --git a/public/assets/plugins/datatables/extensions/AutoFill/images/filler.png b/public/assets/plugins/datatables/extensions/AutoFill/images/filler.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2af65d8c38a5b752894dffc224021da92b182c2
GIT binary patch
literal 1040
zcmaJ=&ui0A9M66@w!&Z+!70ikJBe%ZlKu{>-PSCwvdq#I>|w&vYiQvJ*5b8_Ub{?#`r0{k+Lq*2zHAYueQ6G
zuVR9|Dt172AqG@UH|-#9;#F13*&fks9p&USOBFcNG^F?pgo&gOn--L~AjnEm7NL?z
zMw6*X9Lg!7&6TmfW+9ujxyCU!-jy4yg5}W6GIGszWGF7SK(l1Y?CvGfRj(P&hdK>+K$
z<(~eLG5Kqz6arhHFQ57{oj=S>GJC1~', {
+				'class': 'AutoFill_filler'
+			} )
+			.appendTo( 'body' );
+		this.dom.filler = filler[0];
+
+		// Get the height / width of the click element
+		this.s.filler.height = filler.height();
+		this.s.filler.width = filler.width();
+		filler[0].style.display = "none";
+
+		/* Border display - one div for each side. We can't just use a single
+		 * one with a border, as we want the events to effectively pass through
+		 * the transparent bit of the box
+		 */
+		var border;
+		var appender = document.body;
+		if ( that.s.dt.oScroll.sY !== "" ) {
+			that.s.dt.nTable.parentNode.style.position = "relative";
+			appender = that.s.dt.nTable.parentNode;
+		}
+
+		border = $('
        ', {
+			"class": "AutoFill_border"
+		} );
+		this.dom.borderTop    = border.clone().appendTo( appender )[0];
+		this.dom.borderRight  = border.clone().appendTo( appender )[0];
+		this.dom.borderBottom = border.clone().appendTo( appender )[0];
+		this.dom.borderLeft   = border.clone().appendTo( appender )[0];
+
+		/* Events */
+		filler.on( 'mousedown.DTAF', function (e) {
+			this.onselectstart = function() { return false; };
+			that._fnFillerDragStart.call( that, e );
+			return false;
+		} );
+
+		$('tbody', this.dom.table).on(
+			'mouseover.DTAF mouseout.DTAF',
+			'>tr>td, >tr>th',
+			function (e) {
+				that._fnFillerDisplay.call( that, e );
+			}
+		);
+
+		$(this.dom.table).on( 'destroy.dt.DTAF', function () {
+			filler.off( 'mousedown.DTAF' ).remove();
+			$('tbody', this.dom.table).off( 'mouseover.DTAF mouseout.DTAF' );
+		} );
+	},
+
+
+	_initColumns: function ( )
+	{
+		var that = this;
+		var i, ien;
+		var dt = this.s.dt;
+		var config = this.s.init;
+
+		for ( i=0, ien=dt.aoColumns.length ; i offsetEnd.left) {
+			x1 = offsetEnd.left - border;
+			x2 = offsetStart.left + $(nStart).outerWidth();
+			width = offsetStart.left + $(nStart).outerWidth() - offsetEnd.left + (2*border);
+		}
+
+		if ( this.s.dt.oScroll.sY !== "" )
+		{
+			/* The border elements are inside the DT scroller - so position relative to that */
+			var
+				offsetScroll = $(this.s.dt.nTable.parentNode).offset(),
+				scrollTop = $(this.s.dt.nTable.parentNode).scrollTop(),
+				scrollLeft = $(this.s.dt.nTable.parentNode).scrollLeft();
+
+			x1 -= offsetScroll.left - scrollLeft;
+			x2 -= offsetScroll.left - scrollLeft;
+			y1 -= offsetScroll.top - scrollTop;
+			y2 -= offsetScroll.top - scrollTop;
+		}
+
+		/* Top */
+		oStyle = this.dom.borderTop.style;
+		oStyle.top = y1+"px";
+		oStyle.left = x1+"px";
+		oStyle.height = this.s.border.width+"px";
+		oStyle.width = width+"px";
+
+		/* Bottom */
+		oStyle = this.dom.borderBottom.style;
+		oStyle.top = y2+"px";
+		oStyle.left = x1+"px";
+		oStyle.height = this.s.border.width+"px";
+		oStyle.width = width+"px";
+
+		/* Left */
+		oStyle = this.dom.borderLeft.style;
+		oStyle.top = y1+"px";
+		oStyle.left = x1+"px";
+		oStyle.height = height+"px";
+		oStyle.width = this.s.border.width+"px";
+
+		/* Right */
+		oStyle = this.dom.borderRight.style;
+		oStyle.top = y1+"px";
+		oStyle.left = x2+"px";
+		oStyle.height = height+"px";
+		oStyle.width = this.s.border.width+"px";
+	},
+
+
+	/**
+	 * Mouse down event handler for starting a drag
+	 *  @method  _fnFillerDragStart
+	 *  @param   {Object} e Event object
+	 *  @returns void
+	 */
+	"_fnFillerDragStart": function (e)
+	{
+		var that = this;
+		var startingTd = this.dom.currentTarget;
+
+		this.s.drag.dragging = true;
+
+		that.dom.borderTop.style.display = "block";
+		that.dom.borderRight.style.display = "block";
+		that.dom.borderBottom.style.display = "block";
+		that.dom.borderLeft.style.display = "block";
+
+		var coords = this._fnTargetCoords( startingTd );
+		this.s.drag.startX = coords.x;
+		this.s.drag.startY = coords.y;
+
+		this.s.drag.startTd = startingTd;
+		this.s.drag.endTd = startingTd;
+
+		this._fnUpdateBorder( startingTd, startingTd );
+
+		$(document).bind('mousemove.AutoFill', function (e) {
+			that._fnFillerDragMove.call( that, e );
+		} );
+
+		$(document).bind('mouseup.AutoFill', function (e) {
+			that._fnFillerFinish.call( that, e );
+		} );
+
+		/* Scrolling information cache */
+		this.s.screen.y = e.pageY;
+		this.s.screen.height = $(window).height();
+		this.s.screen.scrollTop = $(document).scrollTop();
+
+		if ( this.s.dt.oScroll.sY !== "" )
+		{
+			this.s.scroller.top = $(this.s.dt.nTable.parentNode).offset().top;
+			this.s.scroller.bottom = this.s.scroller.top + $(this.s.dt.nTable.parentNode).height();
+		}
+
+		/* Scrolling handler - we set an interval (which is cancelled on mouse up) which will fire
+		 * regularly and see if we need to do any scrolling
+		 */
+		this.s.screen.interval = setInterval( function () {
+			var iScrollTop = $(document).scrollTop();
+			var iScrollDelta = iScrollTop - that.s.screen.scrollTop;
+			that.s.screen.y += iScrollDelta;
+
+			if ( that.s.screen.height - that.s.screen.y + iScrollTop < 50 )
+			{
+				$('html, body').animate( {
+					"scrollTop": iScrollTop + 50
+				}, 240, 'linear' );
+			}
+			else if ( that.s.screen.y - iScrollTop < 50 )
+			{
+				$('html, body').animate( {
+					"scrollTop": iScrollTop - 50
+				}, 240, 'linear' );
+			}
+
+			if ( that.s.dt.oScroll.sY !== "" )
+			{
+				if ( that.s.screen.y > that.s.scroller.bottom - 50 )
+				{
+					$(that.s.dt.nTable.parentNode).animate( {
+						"scrollTop": $(that.s.dt.nTable.parentNode).scrollTop() + 50
+					}, 240, 'linear' );
+				}
+				else if ( that.s.screen.y < that.s.scroller.top + 50 )
+				{
+					$(that.s.dt.nTable.parentNode).animate( {
+						"scrollTop": $(that.s.dt.nTable.parentNode).scrollTop() - 50
+					}, 240, 'linear' );
+				}
+			}
+		}, 250 );
+	},
+
+
+	/**
+	 * Mouse move event handler for during a move. See if we want to update the display based on the
+	 * new cursor position
+	 *  @method  _fnFillerDragMove
+	 *  @param   {Object} e Event object
+	 *  @returns void
+	 */
+	"_fnFillerDragMove": function (e)
+	{
+		if ( e.target && e.target.nodeName.toUpperCase() == "TD" &&
+			 e.target != this.s.drag.endTd )
+		{
+			var coords = this._fnTargetCoords( e.target );
+
+			if ( this.c.mode == "y" && coords.x != this.s.drag.startX )
+			{
+				e.target = $('tbody>tr:eq('+coords.y+')>td:eq('+this.s.drag.startX+')', this.dom.table)[0];
+			}
+			if ( this.c.mode == "x" && coords.y != this.s.drag.startY )
+			{
+				e.target = $('tbody>tr:eq('+this.s.drag.startY+')>td:eq('+coords.x+')', this.dom.table)[0];
+			}
+
+			if ( this.c.mode == "either")
+			{
+				if(coords.x != this.s.drag.startX )
+				{
+					e.target = $('tbody>tr:eq('+this.s.drag.startY+')>td:eq('+coords.x+')', this.dom.table)[0];
+				}
+				else if ( coords.y != this.s.drag.startY ) {
+					e.target = $('tbody>tr:eq('+coords.y+')>td:eq('+this.s.drag.startX+')', this.dom.table)[0];
+				}
+			}
+
+			// update coords
+			if ( this.c.mode !== "both" ) {
+				coords = this._fnTargetCoords( e.target );
+			}
+
+			var drag = this.s.drag;
+			drag.endTd = e.target;
+
+			if ( coords.y >= this.s.drag.startY ) {
+				this._fnUpdateBorder( drag.startTd, drag.endTd );
+			}
+			else {
+				this._fnUpdateBorder( drag.endTd, drag.startTd );
+			}
+			this._fnFillerPosition( e.target );
+		}
+
+		/* Update the screen information so we can perform scrolling */
+		this.s.screen.y = e.pageY;
+		this.s.screen.scrollTop = $(document).scrollTop();
+
+		if ( this.s.dt.oScroll.sY !== "" )
+		{
+			this.s.scroller.scrollTop = $(this.s.dt.nTable.parentNode).scrollTop();
+			this.s.scroller.top = $(this.s.dt.nTable.parentNode).offset().top;
+			this.s.scroller.bottom = this.s.scroller.top + $(this.s.dt.nTable.parentNode).height();
+		}
+	},
+
+
+	/**
+	 * Mouse release handler - end the drag and take action to update the cells with the needed values
+	 *  @method  _fnFillerFinish
+	 *  @param   {Object} e Event object
+	 *  @returns void
+	 */
+	"_fnFillerFinish": function (e)
+	{
+		var that = this, i, iLen, j;
+
+		$(document).unbind('mousemove.AutoFill mouseup.AutoFill');
+
+		this.dom.borderTop.style.display = "none";
+		this.dom.borderRight.style.display = "none";
+		this.dom.borderBottom.style.display = "none";
+		this.dom.borderLeft.style.display = "none";
+
+		this.s.drag.dragging = false;
+
+		clearInterval( this.s.screen.interval );
+
+		var cells = [];
+		var table = this.dom.table;
+		var coordsStart = this._fnTargetCoords( this.s.drag.startTd );
+		var coordsEnd = this._fnTargetCoords( this.s.drag.endTd );
+		var columnIndex = function ( visIdx ) {
+			return that.s.dt.oApi._fnVisibleToColumnIndex( that.s.dt, visIdx );
+		};
+
+		// xxx - urgh - there must be a way of reducing this...
+		if ( coordsStart.y <= coordsEnd.y ) {
+			for ( i=coordsStart.y ; i<=coordsEnd.y ; i++ ) {
+				if ( coordsStart.x <= coordsEnd.x ) {
+					for ( j=coordsStart.x ; j<=coordsEnd.x ; j++ ) {
+						cells.push( {
+							node:   $('tbody>tr:eq('+i+')>td:eq('+j+')', table)[0],
+							x:      j - coordsStart.x,
+							y:      i - coordsStart.y,
+							colIdx: columnIndex( j )
+						} );
+					}
+				}
+				else {
+					for ( j=coordsStart.x ; j>=coordsEnd.x ; j-- ) {
+						cells.push( {
+							node:   $('tbody>tr:eq('+i+')>td:eq('+j+')', table)[0],
+							x:      j - coordsStart.x,
+							y:      i - coordsStart.y,
+							colIdx: columnIndex( j )
+						} );
+					}
+				}
+			}
+		}
+		else {
+			for ( i=coordsStart.y ; i>=coordsEnd.y ; i-- ) {
+				if ( coordsStart.x <= coordsEnd.x ) {
+					for ( j=coordsStart.x ; j<=coordsEnd.x ; j++ ) {
+						cells.push( {
+							node:   $('tbody>tr:eq('+i+')>td:eq('+j+')', table)[0],
+							x:      j - coordsStart.x,
+							y:      i - coordsStart.y,
+							colIdx: columnIndex( j )
+						} );
+					}
+				}
+				else {
+					for ( j=coordsStart.x ; j>=coordsEnd.x ; j-- ) {
+						cells.push( {
+							node:   $('tbody>tr:eq('+i+')>td:eq('+j+')', table)[0],
+							x:      coordsStart.x - j,
+							y:      coordsStart.y - i,
+							colIdx: columnIndex( j )
+						} );
+					}
+				}
+			}
+		}
+
+		// An auto-fill requires 2 or more cells
+		if ( cells.length <= 1 ) {
+			return;
+		}
+
+		var edited = [];
+		var previous;
+
+		for ( i=0, iLen=cells.length ; i",{"class":"AutoFill_filler"}).appendTo("body");this.dom.filler=e[0];this.s.filler.height=e.height();this.s.filler.width=e.width();e[0].style.display=
+"none";var g,f=j.body;""!==a.s.dt.oScroll.sY&&(a.s.dt.nTable.parentNode.style.position="relative",f=a.s.dt.nTable.parentNode);g=c("
        ",{"class":"AutoFill_border"});this.dom.borderTop=g.clone().appendTo(f)[0];this.dom.borderRight=g.clone().appendTo(f)[0];this.dom.borderBottom=g.clone().appendTo(f)[0];this.dom.borderLeft=g.clone().appendTo(f)[0];e.on("mousedown.DTAF",function(b){this.onselectstart=function(){return false};a._fnFillerDragStart.call(a,b);return false});c("tbody",this.dom.table).on("mouseover.DTAF mouseout.DTAF",
+">tr>td, >tr>th",function(b){a._fnFillerDisplay.call(a,b)});c(this.dom.table).on("destroy.dt.DTAF",function(){e.off("mousedown.DTAF").remove();c("tbody",this.dom.table).off("mouseover.DTAF mouseout.DTAF")})},_initColumns:function(){var d=this,b,a,e=this.s.dt,g=this.s.init;b=0;for(a=e.aoColumns.length;bg.left&&(f=g.left-a,i=e.left+c(d).outerWidth(),j=e.left+c(d).outerWidth()-g.left+2*a);""!==this.s.dt.oScroll.sY&&(a=c(this.s.dt.nTable.parentNode).offset(),e=c(this.s.dt.nTable.parentNode).scrollTop(),
+g=c(this.s.dt.nTable.parentNode).scrollLeft(),f-=a.left-g,i-=a.left-g,n-=a.top-e,h-=a.top-e);a=this.dom.borderTop.style;a.top=n+"px";a.left=f+"px";a.height=this.s.border.width+"px";a.width=j+"px";a=this.dom.borderBottom.style;a.top=h+"px";a.left=f+"px";a.height=this.s.border.width+"px";a.width=j+"px";a=this.dom.borderLeft.style;a.top=n+"px";a.left=f+"px";a.height=k+"px";a.width=this.s.border.width+"px";a=this.dom.borderRight.style;a.top=n+"px";a.left=i+"px";a.height=k+"px";a.width=this.s.border.width+
+"px"},_fnFillerDragStart:function(d){var b=this,a=this.dom.currentTarget;this.s.drag.dragging=!0;b.dom.borderTop.style.display="block";b.dom.borderRight.style.display="block";b.dom.borderBottom.style.display="block";b.dom.borderLeft.style.display="block";var e=this._fnTargetCoords(a);this.s.drag.startX=e.x;this.s.drag.startY=e.y;this.s.drag.startTd=a;this.s.drag.endTd=a;this._fnUpdateBorder(a,a);c(j).bind("mousemove.AutoFill",function(a){b._fnFillerDragMove.call(b,a)});c(j).bind("mouseup.AutoFill",
+function(a){b._fnFillerFinish.call(b,a)});this.s.screen.y=d.pageY;this.s.screen.height=c(o).height();this.s.screen.scrollTop=c(j).scrollTop();""!==this.s.dt.oScroll.sY&&(this.s.scroller.top=c(this.s.dt.nTable.parentNode).offset().top,this.s.scroller.bottom=this.s.scroller.top+c(this.s.dt.nTable.parentNode).height());this.s.screen.interval=setInterval(function(){var a=c(j).scrollTop();b.s.screen.y=b.s.screen.y+(a-b.s.screen.scrollTop);b.s.screen.height-b.s.screen.y+a<50?c("html, body").animate({scrollTop:a+
+50},240,"linear"):b.s.screen.y-a<50&&c("html, body").animate({scrollTop:a-50},240,"linear");b.s.dt.oScroll.sY!==""&&(b.s.screen.y>b.s.scroller.bottom-50?c(b.s.dt.nTable.parentNode).animate({scrollTop:c(b.s.dt.nTable.parentNode).scrollTop()+50},240,"linear"):b.s.screen.ytr:eq("+b.y+")>td:eq("+this.s.drag.startX+")",this.dom.table)[0]);"x"==this.c.mode&&b.y!=this.s.drag.startY&&(d.target=c("tbody>tr:eq("+this.s.drag.startY+")>td:eq("+b.x+")",this.dom.table)[0]);"either"==this.c.mode&&(b.x!=this.s.drag.startX?d.target=c("tbody>tr:eq("+this.s.drag.startY+")>td:eq("+b.x+")",this.dom.table)[0]:b.y!=this.s.drag.startY&&(d.target=c("tbody>tr:eq("+b.y+")>td:eq("+this.s.drag.startX+
+")",this.dom.table)[0]));"both"!==this.c.mode&&(b=this._fnTargetCoords(d.target));var a=this.s.drag;a.endTd=d.target;b.y>=this.s.drag.startY?this._fnUpdateBorder(a.startTd,a.endTd):this._fnUpdateBorder(a.endTd,a.startTd);this._fnFillerPosition(d.target)}this.s.screen.y=d.pageY;this.s.screen.scrollTop=c(j).scrollTop();""!==this.s.dt.oScroll.sY&&(this.s.scroller.scrollTop=c(this.s.dt.nTable.parentNode).scrollTop(),this.s.scroller.top=c(this.s.dt.nTable.parentNode).offset().top,this.s.scroller.bottom=
+this.s.scroller.top+c(this.s.dt.nTable.parentNode).height())},_fnFillerFinish:function(){var d=this,b,a;c(j).unbind("mousemove.AutoFill mouseup.AutoFill");this.dom.borderTop.style.display="none";this.dom.borderRight.style.display="none";this.dom.borderBottom.style.display="none";this.dom.borderLeft.style.display="none";this.s.drag.dragging=!1;clearInterval(this.s.screen.interval);var e=[],g=this.dom.table,f=this._fnTargetCoords(this.s.drag.startTd),i=this._fnTargetCoords(this.s.drag.endTd),h=function(a){return d.s.dt.oApi._fnVisibleToColumnIndex(d.s.dt,
+a)};if(f.y<=i.y)for(b=f.y;b<=i.y;b++)if(f.x<=i.x)for(a=f.x;a<=i.x;a++)e.push({node:c("tbody>tr:eq("+b+")>td:eq("+a+")",g)[0],x:a-f.x,y:b-f.y,colIdx:h(a)});else for(a=f.x;a>=i.x;a--)e.push({node:c("tbody>tr:eq("+b+")>td:eq("+a+")",g)[0],x:a-f.x,y:b-f.y,colIdx:h(a)});else for(b=f.y;b>=i.y;b--)if(f.x<=i.x)for(a=f.x;a<=i.x;a++)e.push({node:c("tbody>tr:eq("+b+")>td:eq("+a+")",g)[0],x:a-f.x,y:b-f.y,colIdx:h(a)});else for(a=f.x;a>=i.x;a--)e.push({node:c("tbody>tr:eq("+b+")>td:eq("+a+")",g)[0],x:f.x-a,y:f.y-
+b,colIdx:h(a)});if(!(1>=e.length)){var g=[],m;b=0;for(a=e.length;bg||0>f?-1:1)):a===m?b:a}}};return h};"function"===typeof define&&define.amd?
+define(["jquery","datatables"],l):"object"===typeof exports?l(require("jquery"),require("datatables")):jQuery&&!jQuery.fn.dataTable.AutoFill&&l(jQuery,jQuery.fn.dataTable)})(window,document);
diff --git a/public/assets/plugins/datatables/extensions/ColReorder/License.txt b/public/assets/plugins/datatables/extensions/ColReorder/License.txt
new file mode 100644
index 00000000..9ade2f1b
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/ColReorder/License.txt
@@ -0,0 +1,20 @@
+Copyright (c) 2010-2015 SpryMedia Limited
+http://datatables.net
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+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.
diff --git a/public/assets/plugins/datatables/extensions/ColReorder/Readme.md b/public/assets/plugins/datatables/extensions/ColReorder/Readme.md
new file mode 100644
index 00000000..217dd60e
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/ColReorder/Readme.md
@@ -0,0 +1,39 @@
+# ColReorder
+
+ColReorder adds the ability for the end user to click and drag column headers to reorder a table as they see fit, to DataTables. Key features include:
+
+* Very easy integration with DataTables
+* Tight integration with all other DataTables plug-ins
+* The ability to exclude the first (or more) column from being movable
+* Predefine a column order
+* Save staving integration with DataTables
+
+
+# Installation
+
+To use ColReorder, first download DataTables ( http://datatables.net/download ) and place the unzipped ColReorder package into a `extensions` directory in the DataTables package. This will allow the pages in the examples to operate correctly. To see the examples running, open the `examples` directory in your web-browser.
+
+
+# Basic usage
+
+ColReorder is initialised using the `$.fn.dataTable.ColReorder` constructor. For example:
+
+```js
+$(document).ready( function () {
+    $('#example').DataTable();
+
+    new $.fn.dataTable.ColReorder( table );
+} );
+```
+
+
+# Documentation / support
+
+* Documentation: http://datatables.net/extensions/colreorder/
+* DataTables support forums: http://datatables.net/forums
+
+
+# GitHub
+
+If you fancy getting involved with the development of ColReorder and help make it better, please refer to its GitHub repo: https://github.com/DataTables/ColReorder
+
diff --git a/public/assets/plugins/datatables/extensions/ColReorder/css/dataTables.colReorder.css b/public/assets/plugins/datatables/extensions/ColReorder/css/dataTables.colReorder.css
new file mode 100644
index 00000000..bdd6aa0b
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/ColReorder/css/dataTables.colReorder.css
@@ -0,0 +1,14 @@
+/*
+ * Namespace DTCR - "DataTables ColReorder" plug-in
+ */
+
+table.DTCR_clonedTable {
+	background-color: rgba(255, 255, 255, 0.7);
+	z-index: 202;
+}
+
+div.DTCR_pointer {
+	width: 1px;
+	background-color: #0259C4;
+	z-index: 201;
+}
\ No newline at end of file
diff --git a/public/assets/plugins/datatables/extensions/ColReorder/css/dataTables.colReorder.min.css b/public/assets/plugins/datatables/extensions/ColReorder/css/dataTables.colReorder.min.css
new file mode 100644
index 00000000..77b230e0
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/ColReorder/css/dataTables.colReorder.min.css
@@ -0,0 +1 @@
+table.DTCR_clonedTable{background-color:rgba(255,255,255,0.7);z-index:202}div.DTCR_pointer{width:1px;background-color:#0259C4;z-index:201}
diff --git a/public/assets/plugins/datatables/extensions/ColReorder/examples/alt_insert.html b/public/assets/plugins/datatables/extensions/ColReorder/examples/alt_insert.html
new file mode 100644
index 00000000..16bedcfe
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/ColReorder/examples/alt_insert.html
@@ -0,0 +1,637 @@
+
+
+
+	
+	
+	
+
+	ColReorder example - Alternative insert styling
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
        
+		
        
+			
        ColReorder example Alternative insert styling
        
+
+			
        
+				
        Using CSS it is easy to modify the insert bar to suit your web-site. This example shows how an arrow can be used to show the insert point rather than the
+				straight bar used in the other examples by simply adding an extra CSS rule to include the image.
        
+			
        
+
+			
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+				
+			
        NamePositionOfficeAgeStart dateSalary
        NamePositionOfficeAgeStart dateSalary
        Tiger NixonSystem ArchitectEdinburgh612011/04/25$320,800
        Garrett WintersAccountantTokyo632011/07/25$170,750
        Ashton CoxJunior Technical AuthorSan Francisco662009/01/12$86,000
        Cedric KellySenior Javascript DeveloperEdinburgh222012/03/29$433,060
        Airi SatouAccountantTokyo332008/11/28$162,700
        Brielle WilliamsonIntegration SpecialistNew York612012/12/02$372,000
        Herrod ChandlerSales AssistantSan Francisco592012/08/06$137,500
        Rhona DavidsonIntegration SpecialistTokyo552010/10/14$327,900
        Colleen HurstJavascript DeveloperSan Francisco392009/09/15$205,500
        Sonya FrostSoftware EngineerEdinburgh232008/12/13$103,600
        Jena GainesOffice ManagerLondon302008/12/19$90,560
        Quinn FlynnSupport LeadEdinburgh222013/03/03$342,000
        Charde MarshallRegional DirectorSan Francisco362008/10/16$470,600
        Haley KennedySenior Marketing DesignerLondon432012/12/18$313,500
        Tatyana FitzpatrickRegional DirectorLondon192010/03/17$385,750
        Michael SilvaMarketing DesignerLondon662012/11/27$198,500
        Paul ByrdChief Financial Officer (CFO)New York642010/06/09$725,000
        Gloria LittleSystems AdministratorNew York592009/04/10$237,500
        Bradley GreerSoftware EngineerLondon412012/10/13$132,000
        Dai RiosPersonnel LeadEdinburgh352012/09/26$217,500
        Jenette CaldwellDevelopment LeadNew York302011/09/03$345,000
        Yuri BerryChief Marketing Officer (CMO)New York402009/06/25$675,000
        Caesar VancePre-Sales SupportNew York212011/12/12$106,450
        Doris WilderSales AssistantSidney232010/09/20$85,600
        Angelica RamosChief Executive Officer (CEO)London472009/10/09$1,200,000
        Gavin JoyceDeveloperEdinburgh422010/12/22$92,575
        Jennifer ChangRegional DirectorSingapore282010/11/14$357,650
        Brenden WagnerSoftware EngineerSan Francisco282011/06/07$206,850
        Fiona GreenChief Operating Officer (COO)San Francisco482010/03/11$850,000
        Shou ItouRegional MarketingTokyo202011/08/14$163,000
        Michelle HouseIntegration SpecialistSidney372011/06/02$95,400
        Suki BurksDeveloperLondon532009/10/22$114,500
        Prescott BartlettTechnical AuthorLondon272011/05/07$145,000
        Gavin CortezTeam LeaderSan Francisco222008/10/26$235,500
        Martena MccrayPost-Sales supportEdinburgh462011/03/09$324,050
        Unity ButlerMarketing DesignerSan Francisco472009/12/09$85,675
        Howard HatfieldOffice ManagerSan Francisco512008/12/16$164,500
        Hope FuentesSecretarySan Francisco412010/02/12$109,850
        Vivian HarrellFinancial ControllerSan Francisco622009/02/14$452,500
        Timothy MooneyOffice ManagerLondon372008/12/11$136,200
        Jackson BradshawDirectorNew York652008/09/26$645,750
        Olivia LiangSupport EngineerSingapore642011/02/03$234,500
        Bruno NashSoftware EngineerLondon382011/05/03$163,500
        Sakura YamamotoSupport EngineerTokyo372009/08/19$139,575
        Thor WaltonDeveloperNew York612013/08/11$98,540
        Finn CamachoSupport EngineerSan Francisco472009/07/07$87,500
        Serge BaldwinData CoordinatorSingapore642012/04/09$138,575
        Zenaida FrankSoftware EngineerNew York632010/01/04$125,250
        Zorita SerranoSoftware EngineerSan Francisco562012/06/01$115,000
        Jennifer AcostaJunior Javascript DeveloperEdinburgh432013/02/01$75,650
        Cara StevensSales AssistantNew York462011/12/06$145,600
        Hermione ButlerRegional DirectorLondon472011/03/21$356,250
        Lael GreerSystems AdministratorLondon212009/02/27$103,500
        Jonas AlexanderDeveloperSan Francisco302010/07/14$86,500
        Shad DeckerRegional DirectorEdinburgh512008/11/13$183,000
        Michael BruceJavascript DeveloperSingapore292011/06/27$183,000
        Donna SniderCustomer SupportNew York272011/01/25$112,000
        
+
+			
          
+				
        • Javascript
          • 
+				
        • HTML
          • 
+				
        • CSS
          • 
+				
        • Ajax
          • 
+				
        • Server-side script
          • 
+			
        
+
+			
        
+				
        
+					
        The Javascript shown below is used to initialise the table shown in this example:
        $(document).ready(function() {
+	$('#example').DataTable( {
+		dom: 'Rlfrtip'
+	} );
+} );
+
+					
        In addition to the above code, the following Javascript library files are loaded for use in this example:
        
+
+					
+				
        
+
+				
        
+					
        The HTML shown below is the raw HTML table element, before it has been enhanced by DataTables:
        
+				
        
+
+				
        
+					
        
+						
        This example uses a little bit of additional CSS beyond what is loaded from the library files (below), in order to correctly display the table. The
+						additional CSS used is shown below:
        div.DTCR_pointer {
+	margin-top: -15px;
+	margin-left: -9px;
+	width: 18px;
+	background: url('../images/insert.png') no-repeat top left;
+}
+					
        
+
+					
        The following CSS library files are loaded for use in this example to provide the styling of the table:
        
+
+					
+				
        
+
+				
        
+					
        This table loads data by Ajax. The latest data that has been loaded is shown below. This data will update automatically as any additional data is
+					loaded.
        
+				
        
+
+				
        
+					
        The script used to perform the server-side processing for this table is shown below. Please note that this is just an example script using PHP. Server-side
+					processing scripts can be written in any language, using the protocol described in the DataTables
+					documentation.
        
+				
        
+			
        
+		
        
+	
        
+
+	
        
+		
        
+			
        
+
+			
        
+				
        Other examples
        
+
+				
        
+					
        
+						
        Examples
        
+						
+					
        
+				
        
+
+				
        
+					
        Please refer to the DataTables documentation for full information about its API properties and methods.
        
+					Additionally, there are a wide range of extras and plug-ins
+					which extend the capabilities of DataTables.
        
+
+					
        DataTables designed and created by SpryMedia Ltd © 2007-2015
        
+					DataTables is licensed under the MIT license.
        
+				
        
+			
        
+		
        
+	
        
+
+
\ No newline at end of file
diff --git a/public/assets/plugins/datatables/extensions/ColReorder/examples/col_filter.html b/public/assets/plugins/datatables/extensions/ColReorder/examples/col_filter.html
new file mode 100644
index 00000000..355ff2b5
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/ColReorder/examples/col_filter.html
@@ -0,0 +1,656 @@
+
+
+
+	
+	
+	
+
+	ColReorder example - Individual column filtering
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
        
+		
        
+			
        ColReorder example Individual column filtering
        
+
+			
        
+				
        This example of how to use ColReorder shows how it can with with DataTables' ability to do individual column filtering. The basic example is exactly the same as
+				the DataTables column filtering example, but with ColReorder also added to the table (through the R option for domDT).
        
+			
        
+
+			
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+				
+			
        NamePositionOfficeAgeStart dateSalary
        NamePositionOfficeAgeStart dateSalary
        Tiger NixonSystem ArchitectEdinburgh612011/04/25$320,800
        Garrett WintersAccountantTokyo632011/07/25$170,750
        Ashton CoxJunior Technical AuthorSan Francisco662009/01/12$86,000
        Cedric KellySenior Javascript DeveloperEdinburgh222012/03/29$433,060
        Airi SatouAccountantTokyo332008/11/28$162,700
        Brielle WilliamsonIntegration SpecialistNew York612012/12/02$372,000
        Herrod ChandlerSales AssistantSan Francisco592012/08/06$137,500
        Rhona DavidsonIntegration SpecialistTokyo552010/10/14$327,900
        Colleen HurstJavascript DeveloperSan Francisco392009/09/15$205,500
        Sonya FrostSoftware EngineerEdinburgh232008/12/13$103,600
        Jena GainesOffice ManagerLondon302008/12/19$90,560
        Quinn FlynnSupport LeadEdinburgh222013/03/03$342,000
        Charde MarshallRegional DirectorSan Francisco362008/10/16$470,600
        Haley KennedySenior Marketing DesignerLondon432012/12/18$313,500
        Tatyana FitzpatrickRegional DirectorLondon192010/03/17$385,750
        Michael SilvaMarketing DesignerLondon662012/11/27$198,500
        Paul ByrdChief Financial Officer (CFO)New York642010/06/09$725,000
        Gloria LittleSystems AdministratorNew York592009/04/10$237,500
        Bradley GreerSoftware EngineerLondon412012/10/13$132,000
        Dai RiosPersonnel LeadEdinburgh352012/09/26$217,500
        Jenette CaldwellDevelopment LeadNew York302011/09/03$345,000
        Yuri BerryChief Marketing Officer (CMO)New York402009/06/25$675,000
        Caesar VancePre-Sales SupportNew York212011/12/12$106,450
        Doris WilderSales AssistantSidney232010/09/20$85,600
        Angelica RamosChief Executive Officer (CEO)London472009/10/09$1,200,000
        Gavin JoyceDeveloperEdinburgh422010/12/22$92,575
        Jennifer ChangRegional DirectorSingapore282010/11/14$357,650
        Brenden WagnerSoftware EngineerSan Francisco282011/06/07$206,850
        Fiona GreenChief Operating Officer (COO)San Francisco482010/03/11$850,000
        Shou ItouRegional MarketingTokyo202011/08/14$163,000
        Michelle HouseIntegration SpecialistSidney372011/06/02$95,400
        Suki BurksDeveloperLondon532009/10/22$114,500
        Prescott BartlettTechnical AuthorLondon272011/05/07$145,000
        Gavin CortezTeam LeaderSan Francisco222008/10/26$235,500
        Martena MccrayPost-Sales supportEdinburgh462011/03/09$324,050
        Unity ButlerMarketing DesignerSan Francisco472009/12/09$85,675
        Howard HatfieldOffice ManagerSan Francisco512008/12/16$164,500
        Hope FuentesSecretarySan Francisco412010/02/12$109,850
        Vivian HarrellFinancial ControllerSan Francisco622009/02/14$452,500
        Timothy MooneyOffice ManagerLondon372008/12/11$136,200
        Jackson BradshawDirectorNew York652008/09/26$645,750
        Olivia LiangSupport EngineerSingapore642011/02/03$234,500
        Bruno NashSoftware EngineerLondon382011/05/03$163,500
        Sakura YamamotoSupport EngineerTokyo372009/08/19$139,575
        Thor WaltonDeveloperNew York612013/08/11$98,540
        Finn CamachoSupport EngineerSan Francisco472009/07/07$87,500
        Serge BaldwinData CoordinatorSingapore642012/04/09$138,575
        Zenaida FrankSoftware EngineerNew York632010/01/04$125,250
        Zorita SerranoSoftware EngineerSan Francisco562012/06/01$115,000
        Jennifer AcostaJunior Javascript DeveloperEdinburgh432013/02/01$75,650
        Cara StevensSales AssistantNew York462011/12/06$145,600
        Hermione ButlerRegional DirectorLondon472011/03/21$356,250
        Lael GreerSystems AdministratorLondon212009/02/27$103,500
        Jonas AlexanderDeveloperSan Francisco302010/07/14$86,500
        Shad DeckerRegional DirectorEdinburgh512008/11/13$183,000
        Michael BruceJavascript DeveloperSingapore292011/06/27$183,000
        Donna SniderCustomer SupportNew York272011/01/25$112,000
        
+
+			
          
+				
        • Javascript
          • 
+				
        • HTML
          • 
+				
        • CSS
          • 
+				
        • Ajax
          • 
+				
        • Server-side script
          • 
+			
        
+
+			
        
+				
        
+					
        The Javascript shown below is used to initialise the table shown in this example:
        $(document).ready(function() {
+    // Setup - add a text input to each footer cell
+    $('#example tfoot th').each( function () {
+        var title = $('#example thead th').eq( $(this).index() ).text();
+        $(this).html( '<input type="text" placeholder="Search '+title+'" />' );
+    } );
+ 
+    // DataTable
+    var table = $('#example').DataTable( {
+		dom: 'Rlfrtip'
+	} );
+     
+    // Apply the filter
+    $("#example tfoot input").on( 'keyup change', function () {
+        table
+            .column( $(this).parent().index()+':visible' )
+            .search( this.value )
+            .draw();
+    } );
+} );
+
+					
        In addition to the above code, the following Javascript library files are loaded for use in this example:
        
+
+					
+				
        
+
+				
        
+					
        The HTML shown below is the raw HTML table element, before it has been enhanced by DataTables:
        
+				
        
+
+				
        
+					
        
+						
        This example uses a little bit of additional CSS beyond what is loaded from the library files (below), in order to correctly display the table. The
+						additional CSS used is shown below:
        
+					
        
+
+					
        The following CSS library files are loaded for use in this example to provide the styling of the table:
        
+
+					
+				
        
+
+				
        
+					
        This table loads data by Ajax. The latest data that has been loaded is shown below. This data will update automatically as any additional data is
+					loaded.
        
+				
        
+
+				
        
+					
        The script used to perform the server-side processing for this table is shown below. Please note that this is just an example script using PHP. Server-side
+					processing scripts can be written in any language, using the protocol described in the DataTables
+					documentation.
        
+				
        
+			
        
+		
        
+	
        
+
+	
        
+		
        
+			
        
+
+			
        
+				
        Other examples
        
+
+				
        
+					
        
+						
        Examples
        
+						
+					
        
+				
        
+
+				
        
+					
        Please refer to the DataTables documentation for full information about its API properties and methods.
        
+					Additionally, there are a wide range of extras and plug-ins
+					which extend the capabilities of DataTables.
        
+
+					
        DataTables designed and created by SpryMedia Ltd © 2007-2015
        
+					DataTables is licensed under the MIT license.
        
+				
        
+			
        
+		
        
+	
        
+
+
\ No newline at end of file
diff --git a/public/assets/plugins/datatables/extensions/ColReorder/examples/colvis.html b/public/assets/plugins/datatables/extensions/ColReorder/examples/colvis.html
new file mode 100644
index 00000000..54c79c2a
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/ColReorder/examples/colvis.html
@@ -0,0 +1,635 @@
+
+
+
+	
+	
+	
+
+	ColReorder example - ColVis integration
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
        
+		
        
+			
        ColReorder example ColVis integration
        
+
+			
        
+				
        ColReorder interfaces with the ColVis extension for DataTables by updating the order of the list of columns
+				whenever a reorder is done. This is shown in the example below, where one column has been initially hidden to add extra emphasis to ColVis.
        
+			
        
+
+			
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+				
+			
        NamePositionOfficeAgeStart dateSalary
        NamePositionOfficeAgeStart dateSalary
        Tiger NixonSystem ArchitectEdinburgh612011/04/25$320,800
        Garrett WintersAccountantTokyo632011/07/25$170,750
        Ashton CoxJunior Technical AuthorSan Francisco662009/01/12$86,000
        Cedric KellySenior Javascript DeveloperEdinburgh222012/03/29$433,060
        Airi SatouAccountantTokyo332008/11/28$162,700
        Brielle WilliamsonIntegration SpecialistNew York612012/12/02$372,000
        Herrod ChandlerSales AssistantSan Francisco592012/08/06$137,500
        Rhona DavidsonIntegration SpecialistTokyo552010/10/14$327,900
        Colleen HurstJavascript DeveloperSan Francisco392009/09/15$205,500
        Sonya FrostSoftware EngineerEdinburgh232008/12/13$103,600
        Jena GainesOffice ManagerLondon302008/12/19$90,560
        Quinn FlynnSupport LeadEdinburgh222013/03/03$342,000
        Charde MarshallRegional DirectorSan Francisco362008/10/16$470,600
        Haley KennedySenior Marketing DesignerLondon432012/12/18$313,500
        Tatyana FitzpatrickRegional DirectorLondon192010/03/17$385,750
        Michael SilvaMarketing DesignerLondon662012/11/27$198,500
        Paul ByrdChief Financial Officer (CFO)New York642010/06/09$725,000
        Gloria LittleSystems AdministratorNew York592009/04/10$237,500
        Bradley GreerSoftware EngineerLondon412012/10/13$132,000
        Dai RiosPersonnel LeadEdinburgh352012/09/26$217,500
        Jenette CaldwellDevelopment LeadNew York302011/09/03$345,000
        Yuri BerryChief Marketing Officer (CMO)New York402009/06/25$675,000
        Caesar VancePre-Sales SupportNew York212011/12/12$106,450
        Doris WilderSales AssistantSidney232010/09/20$85,600
        Angelica RamosChief Executive Officer (CEO)London472009/10/09$1,200,000
        Gavin JoyceDeveloperEdinburgh422010/12/22$92,575
        Jennifer ChangRegional DirectorSingapore282010/11/14$357,650
        Brenden WagnerSoftware EngineerSan Francisco282011/06/07$206,850
        Fiona GreenChief Operating Officer (COO)San Francisco482010/03/11$850,000
        Shou ItouRegional MarketingTokyo202011/08/14$163,000
        Michelle HouseIntegration SpecialistSidney372011/06/02$95,400
        Suki BurksDeveloperLondon532009/10/22$114,500
        Prescott BartlettTechnical AuthorLondon272011/05/07$145,000
        Gavin CortezTeam LeaderSan Francisco222008/10/26$235,500
        Martena MccrayPost-Sales supportEdinburgh462011/03/09$324,050
        Unity ButlerMarketing DesignerSan Francisco472009/12/09$85,675
        Howard HatfieldOffice ManagerSan Francisco512008/12/16$164,500
        Hope FuentesSecretarySan Francisco412010/02/12$109,850
        Vivian HarrellFinancial ControllerSan Francisco622009/02/14$452,500
        Timothy MooneyOffice ManagerLondon372008/12/11$136,200
        Jackson BradshawDirectorNew York652008/09/26$645,750
        Olivia LiangSupport EngineerSingapore642011/02/03$234,500
        Bruno NashSoftware EngineerLondon382011/05/03$163,500
        Sakura YamamotoSupport EngineerTokyo372009/08/19$139,575
        Thor WaltonDeveloperNew York612013/08/11$98,540
        Finn CamachoSupport EngineerSan Francisco472009/07/07$87,500
        Serge BaldwinData CoordinatorSingapore642012/04/09$138,575
        Zenaida FrankSoftware EngineerNew York632010/01/04$125,250
        Zorita SerranoSoftware EngineerSan Francisco562012/06/01$115,000
        Jennifer AcostaJunior Javascript DeveloperEdinburgh432013/02/01$75,650
        Cara StevensSales AssistantNew York462011/12/06$145,600
        Hermione ButlerRegional DirectorLondon472011/03/21$356,250
        Lael GreerSystems AdministratorLondon212009/02/27$103,500
        Jonas AlexanderDeveloperSan Francisco302010/07/14$86,500
        Shad DeckerRegional DirectorEdinburgh512008/11/13$183,000
        Michael BruceJavascript DeveloperSingapore292011/06/27$183,000
        Donna SniderCustomer SupportNew York272011/01/25$112,000
        
+
+			
          
+				
        • Javascript
          • 
+				
        • HTML
          • 
+				
        • CSS
          • 
+				
        • Ajax
          • 
+				
        • Server-side script
          • 
+			
        
+
+			
        
+				
        
+					
        The Javascript shown below is used to initialise the table shown in this example:
        $(document).ready(function() {
+    var table = $('#example').DataTable( {
+        dom: 'RC<"clear">lfrtip',
+        columnDefs: [
+            { visible: false, targets: 1 }
+        ]
+	} );
+} );
+
+					
        In addition to the above code, the following Javascript library files are loaded for use in this example:
        
+
+					
+				
        
+
+				
        
+					
        The HTML shown below is the raw HTML table element, before it has been enhanced by DataTables:
        
+				
        
+
+				
        
+					
        
+						
        This example uses a little bit of additional CSS beyond what is loaded from the library files (below), in order to correctly display the table. The
+						additional CSS used is shown below:
        
+					
        
+
+					
        The following CSS library files are loaded for use in this example to provide the styling of the table:
        
+
+					
+				
        
+
+				
        
+					
        This table loads data by Ajax. The latest data that has been loaded is shown below. This data will update automatically as any additional data is
+					loaded.
        
+				
        
+
+				
        
+					
        The script used to perform the server-side processing for this table is shown below. Please note that this is just an example script using PHP. Server-side
+					processing scripts can be written in any language, using the protocol described in the DataTables
+					documentation.
        
+				
        
+			
        
+		
        
+	
        
+
+	
        
+		
        
+			
        
+
+			
        
+				
        Other examples
        
+
+				
        
+					
        
+						
        Examples
        
+						
+					
        
+				
        
+
+				
        
+					
        Please refer to the DataTables documentation for full information about its API properties and methods.
        
+					Additionally, there are a wide range of extras and plug-ins
+					which extend the capabilities of DataTables.
        
+
+					
        DataTables designed and created by SpryMedia Ltd © 2007-2015
        
+					DataTables is licensed under the MIT license.
        
+				
        
+			
        
+		
        
+	
        
+
+
\ No newline at end of file
diff --git a/public/assets/plugins/datatables/extensions/ColReorder/examples/fixedcolumns.html b/public/assets/plugins/datatables/extensions/ColReorder/examples/fixedcolumns.html
new file mode 100644
index 00000000..0599ba48
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/ColReorder/examples/fixedcolumns.html
@@ -0,0 +1,831 @@
+
+
+
+	
+	
+	
+
+	ColReorder example - FixedColumns integration
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
        
+		
        
+			
        ColReorder example FixedColumns integration
        
+
+			
        
+				
        While ColReorder works with the built-in scrolling options in DataTables (scrollYDT and scrollXDT) and also the FixedColumns
+				extension.
        
+
+				
        ColReorder provides the fixedColumnsLeft and fixedColumnsRight options which allows you disallow reordering of the fixed columns
+				(which is required).
        
+			
        
+
+			
+				
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+						
+						
+						
+					
+				
+			
        First nameLast namePositionOfficeAgeStart dateSalaryExtn.E-mail
        TigerNixonSystem ArchitectEdinburgh612011/04/25$320,8005421t.nixon@datatables.net
        GarrettWintersAccountantTokyo632011/07/25$170,7508422g.winters@datatables.net
        AshtonCoxJunior Technical AuthorSan Francisco662009/01/12$86,0001562a.cox@datatables.net
        CedricKellySenior Javascript DeveloperEdinburgh222012/03/29$433,0606224c.kelly@datatables.net
        AiriSatouAccountantTokyo332008/11/28$162,7005407a.satou@datatables.net
        BrielleWilliamsonIntegration SpecialistNew York612012/12/02$372,0004804b.williamson@datatables.net
        HerrodChandlerSales AssistantSan Francisco592012/08/06$137,5009608h.chandler@datatables.net
        RhonaDavidsonIntegration SpecialistTokyo552010/10/14$327,9006200r.davidson@datatables.net
        ColleenHurstJavascript DeveloperSan Francisco392009/09/15$205,5002360c.hurst@datatables.net
        SonyaFrostSoftware EngineerEdinburgh232008/12/13$103,6001667s.frost@datatables.net
        JenaGainesOffice ManagerLondon302008/12/19$90,5603814j.gaines@datatables.net
        QuinnFlynnSupport LeadEdinburgh222013/03/03$342,0009497q.flynn@datatables.net
        ChardeMarshallRegional DirectorSan Francisco362008/10/16$470,6006741c.marshall@datatables.net
        HaleyKennedySenior Marketing DesignerLondon432012/12/18$313,5003597h.kennedy@datatables.net
        TatyanaFitzpatrickRegional DirectorLondon192010/03/17$385,7501965t.fitzpatrick@datatables.net
        MichaelSilvaMarketing DesignerLondon662012/11/27$198,5001581m.silva@datatables.net
        PaulByrdChief Financial Officer (CFO)New York642010/06/09$725,0003059p.byrd@datatables.net
        GloriaLittleSystems AdministratorNew York592009/04/10$237,5001721g.little@datatables.net
        BradleyGreerSoftware EngineerLondon412012/10/13$132,0002558b.greer@datatables.net
        DaiRiosPersonnel LeadEdinburgh352012/09/26$217,5002290d.rios@datatables.net
        JenetteCaldwellDevelopment LeadNew York302011/09/03$345,0001937j.caldwell@datatables.net
        YuriBerryChief Marketing Officer (CMO)New York402009/06/25$675,0006154y.berry@datatables.net
        CaesarVancePre-Sales SupportNew York212011/12/12$106,4508330c.vance@datatables.net
        DorisWilderSales AssistantSidney232010/09/20$85,6003023d.wilder@datatables.net
        AngelicaRamosChief Executive Officer (CEO)London472009/10/09$1,200,0005797a.ramos@datatables.net
        GavinJoyceDeveloperEdinburgh422010/12/22$92,5758822g.joyce@datatables.net
        JenniferChangRegional DirectorSingapore282010/11/14$357,6509239j.chang@datatables.net
        BrendenWagnerSoftware EngineerSan Francisco282011/06/07$206,8501314b.wagner@datatables.net
        FionaGreenChief Operating Officer (COO)San Francisco482010/03/11$850,0002947f.green@datatables.net
        ShouItouRegional MarketingTokyo202011/08/14$163,0008899s.itou@datatables.net
        MichelleHouseIntegration SpecialistSidney372011/06/02$95,4002769m.house@datatables.net
        SukiBurksDeveloperLondon532009/10/22$114,5006832s.burks@datatables.net
        PrescottBartlettTechnical AuthorLondon272011/05/07$145,0003606p.bartlett@datatables.net
        GavinCortezTeam LeaderSan Francisco222008/10/26$235,5002860g.cortez@datatables.net
        MartenaMccrayPost-Sales supportEdinburgh462011/03/09$324,0508240m.mccray@datatables.net
        UnityButlerMarketing DesignerSan Francisco472009/12/09$85,6755384u.butler@datatables.net
        HowardHatfieldOffice ManagerSan Francisco512008/12/16$164,5007031h.hatfield@datatables.net
        HopeFuentesSecretarySan Francisco412010/02/12$109,8506318h.fuentes@datatables.net
        VivianHarrellFinancial ControllerSan Francisco622009/02/14$452,5009422v.harrell@datatables.net
        TimothyMooneyOffice ManagerLondon372008/12/11$136,2007580t.mooney@datatables.net
        JacksonBradshawDirectorNew York652008/09/26$645,7501042j.bradshaw@datatables.net
        OliviaLiangSupport EngineerSingapore642011/02/03$234,5002120o.liang@datatables.net
        BrunoNashSoftware EngineerLondon382011/05/03$163,5006222b.nash@datatables.net
        SakuraYamamotoSupport EngineerTokyo372009/08/19$139,5759383s.yamamoto@datatables.net
        ThorWaltonDeveloperNew York612013/08/11$98,5408327t.walton@datatables.net
        FinnCamachoSupport EngineerSan Francisco472009/07/07$87,5002927f.camacho@datatables.net
        SergeBaldwinData CoordinatorSingapore642012/04/09$138,5758352s.baldwin@datatables.net
        ZenaidaFrankSoftware EngineerNew York632010/01/04$125,2507439z.frank@datatables.net
        ZoritaSerranoSoftware EngineerSan Francisco562012/06/01$115,0004389z.serrano@datatables.net
        JenniferAcostaJunior Javascript DeveloperEdinburgh432013/02/01$75,6503431j.acosta@datatables.net
        CaraStevensSales AssistantNew York462011/12/06$145,6003990c.stevens@datatables.net
        HermioneButlerRegional DirectorLondon472011/03/21$356,2501016h.butler@datatables.net
        LaelGreerSystems AdministratorLondon212009/02/27$103,5006733l.greer@datatables.net
        JonasAlexanderDeveloperSan Francisco302010/07/14$86,5008196j.alexander@datatables.net
        ShadDeckerRegional DirectorEdinburgh512008/11/13$183,0006373s.decker@datatables.net
        MichaelBruceJavascript DeveloperSingapore292011/06/27$183,0005384m.bruce@datatables.net
        DonnaSniderCustomer SupportNew York272011/01/25$112,0004226d.snider@datatables.net
        
+
+			
          
+				
        • Javascript
          • 
+				
        • HTML
          • 
+				
        • CSS
          • 
+				
        • Ajax
          • 
+				
        • Server-side script
          • 
+			
        
+
+			
        
+				
        
+					
        The Javascript shown below is used to initialise the table shown in this example:
        $(document).ready(function() {
+	window.table = $('#example').DataTable( {
+		dom: 'Rlfrtip',
+		scrollX: true,
+		scrollCollapse: true,
+		columnDefs: [
+			{ orderable: false, targets: 0 },
+			{ orderable: false, targets: -1 }
+		],
+		ordering: [[ 1, 'asc' ]],
+		colReorder: {
+			fixedColumnsLeft: 1,
+			fixedColumnsRight: 1
+		}
+	} );
+
+	window.fc = new $.fn.dataTable.FixedColumns( table, {
+		leftColumns: 1,
+		rightColumns: 1
+	} );
+} );
+
+					
        In addition to the above code, the following Javascript library files are loaded for use in this example:
        
+
+					
+				
        
+
+				
        
+					
        The HTML shown below is the raw HTML table element, before it has been enhanced by DataTables:
        
+				
        
+
+				
        
+					
        
+						
        This example uses a little bit of additional CSS beyond what is loaded from the library files (below), in order to correctly display the table. The
+						additional CSS used is shown below:
        
+					
        
+
+					
        The following CSS library files are loaded for use in this example to provide the styling of the table:
        
+
+					
+				
        
+
+				
        
+					
        This table loads data by Ajax. The latest data that has been loaded is shown below. This data will update automatically as any additional data is
+					loaded.
        
+				
        
+
+				
        
+					
        The script used to perform the server-side processing for this table is shown below. Please note that this is just an example script using PHP. Server-side
+					processing scripts can be written in any language, using the protocol described in the DataTables
+					documentation.
        
+				
        
+			
        
+		
        
+	
        
+
+	
        
+		
        
+			
        
+
+			
        
+				
        Other examples
        
+
+				
        
+					
        
+						
        Examples
        
+						
+					
        
+				
        
+
+				
        
+					
        Please refer to the DataTables documentation for full information about its API properties and methods.
        
+					Additionally, there are a wide range of extras and plug-ins
+					which extend the capabilities of DataTables.
        
+
+					
        DataTables designed and created by SpryMedia Ltd © 2007-2015
        
+					DataTables is licensed under the MIT license.
        
+				
        
+			
        
+		
        
+	
        
+
+
\ No newline at end of file
diff --git a/public/assets/plugins/datatables/extensions/ColReorder/examples/fixedheader.html b/public/assets/plugins/datatables/extensions/ColReorder/examples/fixedheader.html
new file mode 100644
index 00000000..40f05468
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/ColReorder/examples/fixedheader.html
@@ -0,0 +1,635 @@
+
+
+
+	
+	
+	
+
+	ColReorder example - FixedHeader integration
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
        
+		
        
+			
        ColReorder example FixedHeader integration
        
+
+			
        
+				
        FixedHeader is a particularly useful plug-in for DataTables, allowing a table header to float at the top of a scrolling window. ColReorder works well with
+				FixedHeader, allowing you to reorder columns even using the floating header, as shown in the example below.
        
+			
        
+
+			
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+				
+			
        NamePositionOfficeAgeStart dateSalary
        NamePositionOfficeAgeStart dateSalary
        Tiger NixonSystem ArchitectEdinburgh612011/04/25$320,800
        Garrett WintersAccountantTokyo632011/07/25$170,750
        Ashton CoxJunior Technical AuthorSan Francisco662009/01/12$86,000
        Cedric KellySenior Javascript DeveloperEdinburgh222012/03/29$433,060
        Airi SatouAccountantTokyo332008/11/28$162,700
        Brielle WilliamsonIntegration SpecialistNew York612012/12/02$372,000
        Herrod ChandlerSales AssistantSan Francisco592012/08/06$137,500
        Rhona DavidsonIntegration SpecialistTokyo552010/10/14$327,900
        Colleen HurstJavascript DeveloperSan Francisco392009/09/15$205,500
        Sonya FrostSoftware EngineerEdinburgh232008/12/13$103,600
        Jena GainesOffice ManagerLondon302008/12/19$90,560
        Quinn FlynnSupport LeadEdinburgh222013/03/03$342,000
        Charde MarshallRegional DirectorSan Francisco362008/10/16$470,600
        Haley KennedySenior Marketing DesignerLondon432012/12/18$313,500
        Tatyana FitzpatrickRegional DirectorLondon192010/03/17$385,750
        Michael SilvaMarketing DesignerLondon662012/11/27$198,500
        Paul ByrdChief Financial Officer (CFO)New York642010/06/09$725,000
        Gloria LittleSystems AdministratorNew York592009/04/10$237,500
        Bradley GreerSoftware EngineerLondon412012/10/13$132,000
        Dai RiosPersonnel LeadEdinburgh352012/09/26$217,500
        Jenette CaldwellDevelopment LeadNew York302011/09/03$345,000
        Yuri BerryChief Marketing Officer (CMO)New York402009/06/25$675,000
        Caesar VancePre-Sales SupportNew York212011/12/12$106,450
        Doris WilderSales AssistantSidney232010/09/20$85,600
        Angelica RamosChief Executive Officer (CEO)London472009/10/09$1,200,000
        Gavin JoyceDeveloperEdinburgh422010/12/22$92,575
        Jennifer ChangRegional DirectorSingapore282010/11/14$357,650
        Brenden WagnerSoftware EngineerSan Francisco282011/06/07$206,850
        Fiona GreenChief Operating Officer (COO)San Francisco482010/03/11$850,000
        Shou ItouRegional MarketingTokyo202011/08/14$163,000
        Michelle HouseIntegration SpecialistSidney372011/06/02$95,400
        Suki BurksDeveloperLondon532009/10/22$114,500
        Prescott BartlettTechnical AuthorLondon272011/05/07$145,000
        Gavin CortezTeam LeaderSan Francisco222008/10/26$235,500
        Martena MccrayPost-Sales supportEdinburgh462011/03/09$324,050
        Unity ButlerMarketing DesignerSan Francisco472009/12/09$85,675
        Howard HatfieldOffice ManagerSan Francisco512008/12/16$164,500
        Hope FuentesSecretarySan Francisco412010/02/12$109,850
        Vivian HarrellFinancial ControllerSan Francisco622009/02/14$452,500
        Timothy MooneyOffice ManagerLondon372008/12/11$136,200
        Jackson BradshawDirectorNew York652008/09/26$645,750
        Olivia LiangSupport EngineerSingapore642011/02/03$234,500
        Bruno NashSoftware EngineerLondon382011/05/03$163,500
        Sakura YamamotoSupport EngineerTokyo372009/08/19$139,575
        Thor WaltonDeveloperNew York612013/08/11$98,540
        Finn CamachoSupport EngineerSan Francisco472009/07/07$87,500
        Serge BaldwinData CoordinatorSingapore642012/04/09$138,575
        Zenaida FrankSoftware EngineerNew York632010/01/04$125,250
        Zorita SerranoSoftware EngineerSan Francisco562012/06/01$115,000
        Jennifer AcostaJunior Javascript DeveloperEdinburgh432013/02/01$75,650
        Cara StevensSales AssistantNew York462011/12/06$145,600
        Hermione ButlerRegional DirectorLondon472011/03/21$356,250
        Lael GreerSystems AdministratorLondon212009/02/27$103,500
        Jonas AlexanderDeveloperSan Francisco302010/07/14$86,500
        Shad DeckerRegional DirectorEdinburgh512008/11/13$183,000
        Michael BruceJavascript DeveloperSingapore292011/06/27$183,000
        Donna SniderCustomer SupportNew York272011/01/25$112,000
        
+
+			
          
+				
        • Javascript
          • 
+				
        • HTML
          • 
+				
        • CSS
          • 
+				
        • Ajax
          • 
+				
        • Server-side script
          • 
+			
        
+
+			
        
+				
        
+					
        The Javascript shown below is used to initialise the table shown in this example:
        $(document).ready(function() {
+	var table = $('#example').dataTable( {
+		dom: 'Rlfrtip'
+	} );
+
+	new $.fn.dataTable.fixedHeader( table );
+} );
+
+					
        In addition to the above code, the following Javascript library files are loaded for use in this example:
        
+
+					
+				
        
+
+				
        
+					
        The HTML shown below is the raw HTML table element, before it has been enhanced by DataTables:
        
+				
        
+
+				
        
+					
        
+						
        This example uses a little bit of additional CSS beyond what is loaded from the library files (below), in order to correctly display the table. The
+						additional CSS used is shown below:
        
+					
        
+
+					
        The following CSS library files are loaded for use in this example to provide the styling of the table:
        
+
+					
+				
        
+
+				
        
+					
        This table loads data by Ajax. The latest data that has been loaded is shown below. This data will update automatically as any additional data is
+					loaded.
        
+				
        
+
+				
        
+					
        The script used to perform the server-side processing for this table is shown below. Please note that this is just an example script using PHP. Server-side
+					processing scripts can be written in any language, using the protocol described in the DataTables
+					documentation.
        
+				
        
+			
        
+		
        
+	
        
+
+	
        
+		
        
+			
        
+
+			
        
+				
        Other examples
        
+
+				
        
+					
        
+						
        Examples
        
+						
+					
        
+				
        
+
+				
        
+					
        Please refer to the DataTables documentation for full information about its API properties and methods.
        
+					Additionally, there are a wide range of extras and plug-ins
+					which extend the capabilities of DataTables.
        
+
+					
        DataTables designed and created by SpryMedia Ltd © 2007-2015
        
+					DataTables is licensed under the MIT license.
        
+				
        
+			
        
+		
        
+	
        
+
+
\ No newline at end of file
diff --git a/public/assets/plugins/datatables/extensions/ColReorder/examples/index.html b/public/assets/plugins/datatables/extensions/ColReorder/examples/index.html
new file mode 100644
index 00000000..65018ab6
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/ColReorder/examples/index.html
@@ -0,0 +1,74 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	ColReorder examples - ColReorder examples
+
+
+
+	
        
+		
        
+			
        ColReorder example ColReorder examples
        
+
+			
        
+				
        ColReorder adds the ability for the end user to click and drag column headers to reorder a table as they see fit, to DataTables. Key features include:
        
+
+				
          
+					
        • Very easy integration with DataTables
          • 
+					
        • Tight integration with all other DataTables plug-ins
          • 
+					
        • The ability to exclude the first (or more) column from being movable
          • 
+					
        • Predefine a column order
          • 
+					
        • Save staving integration with DataTables
          • 
+				
        
+			
        
+		
        
+	
        
+
+	
        
+		
        
+			
        
+
+			
        
+				
        
+					
        
+						
        Examples
        
+						
+					
        
+				
        
+
+				
        
+					
        Please refer to the DataTables documentation for full information about its API properties and methods.
        
+					Additionally, there are a wide range of extras and plug-ins
+					which extend the capabilities of DataTables.
        
+
+					
        DataTables designed and created by SpryMedia Ltd © 2007-2015
        
+					DataTables is licensed under the MIT license.
        
+				
        
+			
        
+		
        
+	
        
+
+
\ No newline at end of file
diff --git a/public/assets/plugins/datatables/extensions/ColReorder/examples/jqueryui.html b/public/assets/plugins/datatables/extensions/ColReorder/examples/jqueryui.html
new file mode 100644
index 00000000..8eedf912
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/ColReorder/examples/jqueryui.html
@@ -0,0 +1,635 @@
+
+
+
+	
+	
+	
+
+	ColReorder example - jQuery UI styling
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
        
+		
        
+			
        ColReorder example jQuery UI styling
        
+
+			
        
+				
        This example shows how the jQuery UI ThemeRoller option in DataTables can be used with ColReorder.
        
+
+				
        The important thing to note here is that it is easier to use new $.fn.dataTable.ColReorder() to add ColReorder to the table rather than domDT as the jQuery UI integration
+				uses a complex expression for domDT.
        
+			
        
+
+			
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+				
+			
        NamePositionOfficeAgeStart dateSalary
        NamePositionOfficeAgeStart dateSalary
        Tiger NixonSystem ArchitectEdinburgh612011/04/25$320,800
        Garrett WintersAccountantTokyo632011/07/25$170,750
        Ashton CoxJunior Technical AuthorSan Francisco662009/01/12$86,000
        Cedric KellySenior Javascript DeveloperEdinburgh222012/03/29$433,060
        Airi SatouAccountantTokyo332008/11/28$162,700
        Brielle WilliamsonIntegration SpecialistNew York612012/12/02$372,000
        Herrod ChandlerSales AssistantSan Francisco592012/08/06$137,500
        Rhona DavidsonIntegration SpecialistTokyo552010/10/14$327,900
        Colleen HurstJavascript DeveloperSan Francisco392009/09/15$205,500
        Sonya FrostSoftware EngineerEdinburgh232008/12/13$103,600
        Jena GainesOffice ManagerLondon302008/12/19$90,560
        Quinn FlynnSupport LeadEdinburgh222013/03/03$342,000
        Charde MarshallRegional DirectorSan Francisco362008/10/16$470,600
        Haley KennedySenior Marketing DesignerLondon432012/12/18$313,500
        Tatyana FitzpatrickRegional DirectorLondon192010/03/17$385,750
        Michael SilvaMarketing DesignerLondon662012/11/27$198,500
        Paul ByrdChief Financial Officer (CFO)New York642010/06/09$725,000
        Gloria LittleSystems AdministratorNew York592009/04/10$237,500
        Bradley GreerSoftware EngineerLondon412012/10/13$132,000
        Dai RiosPersonnel LeadEdinburgh352012/09/26$217,500
        Jenette CaldwellDevelopment LeadNew York302011/09/03$345,000
        Yuri BerryChief Marketing Officer (CMO)New York402009/06/25$675,000
        Caesar VancePre-Sales SupportNew York212011/12/12$106,450
        Doris WilderSales AssistantSidney232010/09/20$85,600
        Angelica RamosChief Executive Officer (CEO)London472009/10/09$1,200,000
        Gavin JoyceDeveloperEdinburgh422010/12/22$92,575
        Jennifer ChangRegional DirectorSingapore282010/11/14$357,650
        Brenden WagnerSoftware EngineerSan Francisco282011/06/07$206,850
        Fiona GreenChief Operating Officer (COO)San Francisco482010/03/11$850,000
        Shou ItouRegional MarketingTokyo202011/08/14$163,000
        Michelle HouseIntegration SpecialistSidney372011/06/02$95,400
        Suki BurksDeveloperLondon532009/10/22$114,500
        Prescott BartlettTechnical AuthorLondon272011/05/07$145,000
        Gavin CortezTeam LeaderSan Francisco222008/10/26$235,500
        Martena MccrayPost-Sales supportEdinburgh462011/03/09$324,050
        Unity ButlerMarketing DesignerSan Francisco472009/12/09$85,675
        Howard HatfieldOffice ManagerSan Francisco512008/12/16$164,500
        Hope FuentesSecretarySan Francisco412010/02/12$109,850
        Vivian HarrellFinancial ControllerSan Francisco622009/02/14$452,500
        Timothy MooneyOffice ManagerLondon372008/12/11$136,200
        Jackson BradshawDirectorNew York652008/09/26$645,750
        Olivia LiangSupport EngineerSingapore642011/02/03$234,500
        Bruno NashSoftware EngineerLondon382011/05/03$163,500
        Sakura YamamotoSupport EngineerTokyo372009/08/19$139,575
        Thor WaltonDeveloperNew York612013/08/11$98,540
        Finn CamachoSupport EngineerSan Francisco472009/07/07$87,500
        Serge BaldwinData CoordinatorSingapore642012/04/09$138,575
        Zenaida FrankSoftware EngineerNew York632010/01/04$125,250
        Zorita SerranoSoftware EngineerSan Francisco562012/06/01$115,000
        Jennifer AcostaJunior Javascript DeveloperEdinburgh432013/02/01$75,650
        Cara StevensSales AssistantNew York462011/12/06$145,600
        Hermione ButlerRegional DirectorLondon472011/03/21$356,250
        Lael GreerSystems AdministratorLondon212009/02/27$103,500
        Jonas AlexanderDeveloperSan Francisco302010/07/14$86,500
        Shad DeckerRegional DirectorEdinburgh512008/11/13$183,000
        Michael BruceJavascript DeveloperSingapore292011/06/27$183,000
        Donna SniderCustomer SupportNew York272011/01/25$112,000
        
+
+			
          
+				
        • Javascript
          • 
+				
        • HTML
          • 
+				
        • CSS
          • 
+				
        • Ajax
          • 
+				
        • Server-side script
          • 
+			
        
+
+			
        
+				
        
+					
        The Javascript shown below is used to initialise the table shown in this example:
        $(document).ready(function() {
+	var table = $('#example').dataTable();
+
+	new $.fn.dataTable.ColReorder( table );
+} );
+
+					
        In addition to the above code, the following Javascript library files are loaded for use in this example:
        
+
+					
+				
        
+
+				
        
+					
        The HTML shown below is the raw HTML table element, before it has been enhanced by DataTables:
        
+				
        
+
+				
        
+					
        
+						
        This example uses a little bit of additional CSS beyond what is loaded from the library files (below), in order to correctly display the table. The
+						additional CSS used is shown below:
        
+					
        
+
+					
        The following CSS library files are loaded for use in this example to provide the styling of the table:
        
+
+					
+				
        
+
+				
        
+					
        This table loads data by Ajax. The latest data that has been loaded is shown below. This data will update automatically as any additional data is
+					loaded.
        
+				
        
+
+				
        
+					
        The script used to perform the server-side processing for this table is shown below. Please note that this is just an example script using PHP. Server-side
+					processing scripts can be written in any language, using the protocol described in the DataTables
+					documentation.
        
+				
        
+			
        
+		
        
+	
        
+
+	
        
+		
        
+			
        
+
+			
        
+				
        Other examples
        
+
+				
        
+					
        
+						
        Examples
        
+						
+					
        
+				
        
+
+				
        
+					
        Please refer to the DataTables documentation for full information about its API properties and methods.
        
+					Additionally, there are a wide range of extras and plug-ins
+					which extend the capabilities of DataTables.
        
+
+					
        DataTables designed and created by SpryMedia Ltd © 2007-2015
        
+					DataTables is licensed under the MIT license.
        
+				
        
+			
        
+		
        
+	
        
+
+
\ No newline at end of file
diff --git a/public/assets/plugins/datatables/extensions/ColReorder/examples/new_init.html b/public/assets/plugins/datatables/extensions/ColReorder/examples/new_init.html
new file mode 100644
index 00000000..01ab2aac
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/ColReorder/examples/new_init.html
@@ -0,0 +1,626 @@
+
+
+
+	
+	
+	
+
+	ColReorder example - Initialisation using `new`
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
        
+		
        
+			
        ColReorder example Initialisation using `new`
        
+
+			
        
+				
        As well as providing the option to be initialised through the R option of domDT, ColReorder can also be added to a DataTable using direct initialisation - new
+				$.fn.dataTable.ColReorder(); as shown in this example.
        
+			
        
+
+			
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+				
+			
        NamePositionOfficeAgeStart dateSalary
        NamePositionOfficeAgeStart dateSalary
        Tiger NixonSystem ArchitectEdinburgh612011/04/25$320,800
        Garrett WintersAccountantTokyo632011/07/25$170,750
        Ashton CoxJunior Technical AuthorSan Francisco662009/01/12$86,000
        Cedric KellySenior Javascript DeveloperEdinburgh222012/03/29$433,060
        Airi SatouAccountantTokyo332008/11/28$162,700
        Brielle WilliamsonIntegration SpecialistNew York612012/12/02$372,000
        Herrod ChandlerSales AssistantSan Francisco592012/08/06$137,500
        Rhona DavidsonIntegration SpecialistTokyo552010/10/14$327,900
        Colleen HurstJavascript DeveloperSan Francisco392009/09/15$205,500
        Sonya FrostSoftware EngineerEdinburgh232008/12/13$103,600
        Jena GainesOffice ManagerLondon302008/12/19$90,560
        Quinn FlynnSupport LeadEdinburgh222013/03/03$342,000
        Charde MarshallRegional DirectorSan Francisco362008/10/16$470,600
        Haley KennedySenior Marketing DesignerLondon432012/12/18$313,500
        Tatyana FitzpatrickRegional DirectorLondon192010/03/17$385,750
        Michael SilvaMarketing DesignerLondon662012/11/27$198,500
        Paul ByrdChief Financial Officer (CFO)New York642010/06/09$725,000
        Gloria LittleSystems AdministratorNew York592009/04/10$237,500
        Bradley GreerSoftware EngineerLondon412012/10/13$132,000
        Dai RiosPersonnel LeadEdinburgh352012/09/26$217,500
        Jenette CaldwellDevelopment LeadNew York302011/09/03$345,000
        Yuri BerryChief Marketing Officer (CMO)New York402009/06/25$675,000
        Caesar VancePre-Sales SupportNew York212011/12/12$106,450
        Doris WilderSales AssistantSidney232010/09/20$85,600
        Angelica RamosChief Executive Officer (CEO)London472009/10/09$1,200,000
        Gavin JoyceDeveloperEdinburgh422010/12/22$92,575
        Jennifer ChangRegional DirectorSingapore282010/11/14$357,650
        Brenden WagnerSoftware EngineerSan Francisco282011/06/07$206,850
        Fiona GreenChief Operating Officer (COO)San Francisco482010/03/11$850,000
        Shou ItouRegional MarketingTokyo202011/08/14$163,000
        Michelle HouseIntegration SpecialistSidney372011/06/02$95,400
        Suki BurksDeveloperLondon532009/10/22$114,500
        Prescott BartlettTechnical AuthorLondon272011/05/07$145,000
        Gavin CortezTeam LeaderSan Francisco222008/10/26$235,500
        Martena MccrayPost-Sales supportEdinburgh462011/03/09$324,050
        Unity ButlerMarketing DesignerSan Francisco472009/12/09$85,675
        Howard HatfieldOffice ManagerSan Francisco512008/12/16$164,500
        Hope FuentesSecretarySan Francisco412010/02/12$109,850
        Vivian HarrellFinancial ControllerSan Francisco622009/02/14$452,500
        Timothy MooneyOffice ManagerLondon372008/12/11$136,200
        Jackson BradshawDirectorNew York652008/09/26$645,750
        Olivia LiangSupport EngineerSingapore642011/02/03$234,500
        Bruno NashSoftware EngineerLondon382011/05/03$163,500
        Sakura YamamotoSupport EngineerTokyo372009/08/19$139,575
        Thor WaltonDeveloperNew York612013/08/11$98,540
        Finn CamachoSupport EngineerSan Francisco472009/07/07$87,500
        Serge BaldwinData CoordinatorSingapore642012/04/09$138,575
        Zenaida FrankSoftware EngineerNew York632010/01/04$125,250
        Zorita SerranoSoftware EngineerSan Francisco562012/06/01$115,000
        Jennifer AcostaJunior Javascript DeveloperEdinburgh432013/02/01$75,650
        Cara StevensSales AssistantNew York462011/12/06$145,600
        Hermione ButlerRegional DirectorLondon472011/03/21$356,250
        Lael GreerSystems AdministratorLondon212009/02/27$103,500
        Jonas AlexanderDeveloperSan Francisco302010/07/14$86,500
        Shad DeckerRegional DirectorEdinburgh512008/11/13$183,000
        Michael BruceJavascript DeveloperSingapore292011/06/27$183,000
        Donna SniderCustomer SupportNew York272011/01/25$112,000
        
+
+			
          
+				
        • Javascript
          • 
+				
        • HTML
          • 
+				
        • CSS
          • 
+				
        • Ajax
          • 
+				
        • Server-side script
          • 
+			
        
+
+			
        
+				
        
+					
        The Javascript shown below is used to initialise the table shown in this example:
        $(document).ready(function() {
+	var table = $('#example').DataTable();
+
+	new $.fn.dataTable.ColReorder( table );
+} );
+
+					
        In addition to the above code, the following Javascript library files are loaded for use in this example:
        
+
+					
+				
        
+
+				
        
+					
        The HTML shown below is the raw HTML table element, before it has been enhanced by DataTables:
        
+				
        
+
+				
        
+					
        
+						
        This example uses a little bit of additional CSS beyond what is loaded from the library files (below), in order to correctly display the table. The
+						additional CSS used is shown below:
        
+					
        
+
+					
        The following CSS library files are loaded for use in this example to provide the styling of the table:
        
+
+					
+				
        
+
+				
        
+					
        This table loads data by Ajax. The latest data that has been loaded is shown below. This data will update automatically as any additional data is
+					loaded.
        
+				
        
+
+				
        
+					
        The script used to perform the server-side processing for this table is shown below. Please note that this is just an example script using PHP. Server-side
+					processing scripts can be written in any language, using the protocol described in the DataTables
+					documentation.
        
+				
        
+			
        
+		
        
+	
        
+
+	
        
+		
        
+			
        
+
+			
        
+				
        Other examples
        
+
+				
        
+					
        
+						
        Examples
        
+						
+					
        
+				
        
+
+				
        
+					
        Please refer to the DataTables documentation for full information about its API properties and methods.
        
+					Additionally, there are a wide range of extras and plug-ins
+					which extend the capabilities of DataTables.
        
+
+					
        DataTables designed and created by SpryMedia Ltd © 2007-2015
        
+					DataTables is licensed under the MIT license.
        
+				
        
+			
        
+		
        
+	
        
+
+
\ No newline at end of file
diff --git a/public/assets/plugins/datatables/extensions/ColReorder/examples/predefined.html b/public/assets/plugins/datatables/extensions/ColReorder/examples/predefined.html
new file mode 100644
index 00000000..3cbb1663
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/ColReorder/examples/predefined.html
@@ -0,0 +1,636 @@
+
+
+
+	
+	
+	
+
+	ColReorder example - Predefined column ordering
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
        
+		
        
+			
        ColReorder example Predefined column ordering
        
+
+			
        
+				
        ColReorder provides the ability to specify a column ordering which is not that of the HTML (which typically you will want) through the parameter
+				colReorder.order. This is an array of integers with the column ordering you want.
        
+
+				
        For full information about the ColReorder options, please refer to the ColReorder options
+				documentation.
        
+			
        
+
+			
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+				
+			
        NamePositionOfficeAgeStart dateSalary
        NamePositionOfficeAgeStart dateSalary
        Tiger NixonSystem ArchitectEdinburgh612011/04/25$320,800
        Garrett WintersAccountantTokyo632011/07/25$170,750
        Ashton CoxJunior Technical AuthorSan Francisco662009/01/12$86,000
        Cedric KellySenior Javascript DeveloperEdinburgh222012/03/29$433,060
        Airi SatouAccountantTokyo332008/11/28$162,700
        Brielle WilliamsonIntegration SpecialistNew York612012/12/02$372,000
        Herrod ChandlerSales AssistantSan Francisco592012/08/06$137,500
        Rhona DavidsonIntegration SpecialistTokyo552010/10/14$327,900
        Colleen HurstJavascript DeveloperSan Francisco392009/09/15$205,500
        Sonya FrostSoftware EngineerEdinburgh232008/12/13$103,600
        Jena GainesOffice ManagerLondon302008/12/19$90,560
        Quinn FlynnSupport LeadEdinburgh222013/03/03$342,000
        Charde MarshallRegional DirectorSan Francisco362008/10/16$470,600
        Haley KennedySenior Marketing DesignerLondon432012/12/18$313,500
        Tatyana FitzpatrickRegional DirectorLondon192010/03/17$385,750
        Michael SilvaMarketing DesignerLondon662012/11/27$198,500
        Paul ByrdChief Financial Officer (CFO)New York642010/06/09$725,000
        Gloria LittleSystems AdministratorNew York592009/04/10$237,500
        Bradley GreerSoftware EngineerLondon412012/10/13$132,000
        Dai RiosPersonnel LeadEdinburgh352012/09/26$217,500
        Jenette CaldwellDevelopment LeadNew York302011/09/03$345,000
        Yuri BerryChief Marketing Officer (CMO)New York402009/06/25$675,000
        Caesar VancePre-Sales SupportNew York212011/12/12$106,450
        Doris WilderSales AssistantSidney232010/09/20$85,600
        Angelica RamosChief Executive Officer (CEO)London472009/10/09$1,200,000
        Gavin JoyceDeveloperEdinburgh422010/12/22$92,575
        Jennifer ChangRegional DirectorSingapore282010/11/14$357,650
        Brenden WagnerSoftware EngineerSan Francisco282011/06/07$206,850
        Fiona GreenChief Operating Officer (COO)San Francisco482010/03/11$850,000
        Shou ItouRegional MarketingTokyo202011/08/14$163,000
        Michelle HouseIntegration SpecialistSidney372011/06/02$95,400
        Suki BurksDeveloperLondon532009/10/22$114,500
        Prescott BartlettTechnical AuthorLondon272011/05/07$145,000
        Gavin CortezTeam LeaderSan Francisco222008/10/26$235,500
        Martena MccrayPost-Sales supportEdinburgh462011/03/09$324,050
        Unity ButlerMarketing DesignerSan Francisco472009/12/09$85,675
        Howard HatfieldOffice ManagerSan Francisco512008/12/16$164,500
        Hope FuentesSecretarySan Francisco412010/02/12$109,850
        Vivian HarrellFinancial ControllerSan Francisco622009/02/14$452,500
        Timothy MooneyOffice ManagerLondon372008/12/11$136,200
        Jackson BradshawDirectorNew York652008/09/26$645,750
        Olivia LiangSupport EngineerSingapore642011/02/03$234,500
        Bruno NashSoftware EngineerLondon382011/05/03$163,500
        Sakura YamamotoSupport EngineerTokyo372009/08/19$139,575
        Thor WaltonDeveloperNew York612013/08/11$98,540
        Finn CamachoSupport EngineerSan Francisco472009/07/07$87,500
        Serge BaldwinData CoordinatorSingapore642012/04/09$138,575
        Zenaida FrankSoftware EngineerNew York632010/01/04$125,250
        Zorita SerranoSoftware EngineerSan Francisco562012/06/01$115,000
        Jennifer AcostaJunior Javascript DeveloperEdinburgh432013/02/01$75,650
        Cara StevensSales AssistantNew York462011/12/06$145,600
        Hermione ButlerRegional DirectorLondon472011/03/21$356,250
        Lael GreerSystems AdministratorLondon212009/02/27$103,500
        Jonas AlexanderDeveloperSan Francisco302010/07/14$86,500
        Shad DeckerRegional DirectorEdinburgh512008/11/13$183,000
        Michael BruceJavascript DeveloperSingapore292011/06/27$183,000
        Donna SniderCustomer SupportNew York272011/01/25$112,000
        
+
+			
          
+				
        • Javascript
          • 
+				
        • HTML
          • 
+				
        • CSS
          • 
+				
        • Ajax
          • 
+				
        • Server-side script
          • 
+			
        
+
+			
        
+				
        
+					
        The Javascript shown below is used to initialise the table shown in this example:
        $(document).ready(function() {
+	$('#example').dataTable( {
+		dom: 'Rlfrtip',
+		colReorder: {
+			order: [ 4, 3, 2, 1, 0, 5 ]
+		}
+	} );
+} );
+
+					
        In addition to the above code, the following Javascript library files are loaded for use in this example:
        
+
+					
+				
        
+
+				
        
+					
        The HTML shown below is the raw HTML table element, before it has been enhanced by DataTables:
        
+				
        
+
+				
        
+					
        
+						
        This example uses a little bit of additional CSS beyond what is loaded from the library files (below), in order to correctly display the table. The
+						additional CSS used is shown below:
        
+					
        
+
+					
        The following CSS library files are loaded for use in this example to provide the styling of the table:
        
+
+					
+				
        
+
+				
        
+					
        This table loads data by Ajax. The latest data that has been loaded is shown below. This data will update automatically as any additional data is
+					loaded.
        
+				
        
+
+				
        
+					
        The script used to perform the server-side processing for this table is shown below. Please note that this is just an example script using PHP. Server-side
+					processing scripts can be written in any language, using the protocol described in the DataTables
+					documentation.
        
+				
        
+			
        
+		
        
+	
        
+
+	
        
+		
        
+			
        
+
+			
        
+				
        Other examples
        
+
+				
        
+					
        
+						
        Examples
        
+						
+					
        
+				
        
+
+				
        
+					
        Please refer to the DataTables documentation for full information about its API properties and methods.
        
+					Additionally, there are a wide range of extras and plug-ins
+					which extend the capabilities of DataTables.
        
+
+					
        DataTables designed and created by SpryMedia Ltd © 2007-2015
        
+					DataTables is licensed under the MIT license.
        
+				
        
+			
        
+		
        
+	
        
+
+
\ No newline at end of file
diff --git a/public/assets/plugins/datatables/extensions/ColReorder/examples/realtime.html b/public/assets/plugins/datatables/extensions/ColReorder/examples/realtime.html
new file mode 100644
index 00000000..c759409a
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/ColReorder/examples/realtime.html
@@ -0,0 +1,637 @@
+
+
+
+	
+	
+	
+
+	ColReorder example - Realtime updating
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
        
+		
        
+			
        ColReorder example Realtime updating
        
+
+			
        
+				
        While the ColReorder insertion point indicator can be styled, another option to show the end user what the column will look like when the table has been
+				reordered is to actually do the reordering while the mouse is still dragging the column header. This is shown in this example and is controlled by the
+				realtime parameter.
        
+
+				
        For full information about the ColReorder options, please refer to the ColReorder options
+				documentation.
        
+			
        
+
+			
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+				
+			
        NamePositionOfficeAgeStart dateSalary
        NamePositionOfficeAgeStart dateSalary
        Tiger NixonSystem ArchitectEdinburgh612011/04/25$320,800
        Garrett WintersAccountantTokyo632011/07/25$170,750
        Ashton CoxJunior Technical AuthorSan Francisco662009/01/12$86,000
        Cedric KellySenior Javascript DeveloperEdinburgh222012/03/29$433,060
        Airi SatouAccountantTokyo332008/11/28$162,700
        Brielle WilliamsonIntegration SpecialistNew York612012/12/02$372,000
        Herrod ChandlerSales AssistantSan Francisco592012/08/06$137,500
        Rhona DavidsonIntegration SpecialistTokyo552010/10/14$327,900
        Colleen HurstJavascript DeveloperSan Francisco392009/09/15$205,500
        Sonya FrostSoftware EngineerEdinburgh232008/12/13$103,600
        Jena GainesOffice ManagerLondon302008/12/19$90,560
        Quinn FlynnSupport LeadEdinburgh222013/03/03$342,000
        Charde MarshallRegional DirectorSan Francisco362008/10/16$470,600
        Haley KennedySenior Marketing DesignerLondon432012/12/18$313,500
        Tatyana FitzpatrickRegional DirectorLondon192010/03/17$385,750
        Michael SilvaMarketing DesignerLondon662012/11/27$198,500
        Paul ByrdChief Financial Officer (CFO)New York642010/06/09$725,000
        Gloria LittleSystems AdministratorNew York592009/04/10$237,500
        Bradley GreerSoftware EngineerLondon412012/10/13$132,000
        Dai RiosPersonnel LeadEdinburgh352012/09/26$217,500
        Jenette CaldwellDevelopment LeadNew York302011/09/03$345,000
        Yuri BerryChief Marketing Officer (CMO)New York402009/06/25$675,000
        Caesar VancePre-Sales SupportNew York212011/12/12$106,450
        Doris WilderSales AssistantSidney232010/09/20$85,600
        Angelica RamosChief Executive Officer (CEO)London472009/10/09$1,200,000
        Gavin JoyceDeveloperEdinburgh422010/12/22$92,575
        Jennifer ChangRegional DirectorSingapore282010/11/14$357,650
        Brenden WagnerSoftware EngineerSan Francisco282011/06/07$206,850
        Fiona GreenChief Operating Officer (COO)San Francisco482010/03/11$850,000
        Shou ItouRegional MarketingTokyo202011/08/14$163,000
        Michelle HouseIntegration SpecialistSidney372011/06/02$95,400
        Suki BurksDeveloperLondon532009/10/22$114,500
        Prescott BartlettTechnical AuthorLondon272011/05/07$145,000
        Gavin CortezTeam LeaderSan Francisco222008/10/26$235,500
        Martena MccrayPost-Sales supportEdinburgh462011/03/09$324,050
        Unity ButlerMarketing DesignerSan Francisco472009/12/09$85,675
        Howard HatfieldOffice ManagerSan Francisco512008/12/16$164,500
        Hope FuentesSecretarySan Francisco412010/02/12$109,850
        Vivian HarrellFinancial ControllerSan Francisco622009/02/14$452,500
        Timothy MooneyOffice ManagerLondon372008/12/11$136,200
        Jackson BradshawDirectorNew York652008/09/26$645,750
        Olivia LiangSupport EngineerSingapore642011/02/03$234,500
        Bruno NashSoftware EngineerLondon382011/05/03$163,500
        Sakura YamamotoSupport EngineerTokyo372009/08/19$139,575
        Thor WaltonDeveloperNew York612013/08/11$98,540
        Finn CamachoSupport EngineerSan Francisco472009/07/07$87,500
        Serge BaldwinData CoordinatorSingapore642012/04/09$138,575
        Zenaida FrankSoftware EngineerNew York632010/01/04$125,250
        Zorita SerranoSoftware EngineerSan Francisco562012/06/01$115,000
        Jennifer AcostaJunior Javascript DeveloperEdinburgh432013/02/01$75,650
        Cara StevensSales AssistantNew York462011/12/06$145,600
        Hermione ButlerRegional DirectorLondon472011/03/21$356,250
        Lael GreerSystems AdministratorLondon212009/02/27$103,500
        Jonas AlexanderDeveloperSan Francisco302010/07/14$86,500
        Shad DeckerRegional DirectorEdinburgh512008/11/13$183,000
        Michael BruceJavascript DeveloperSingapore292011/06/27$183,000
        Donna SniderCustomer SupportNew York272011/01/25$112,000
        
+
+			
          
+				
        • Javascript
          • 
+				
        • HTML
          • 
+				
        • CSS
          • 
+				
        • Ajax
          • 
+				
        • Server-side script
          • 
+			
        
+
+			
        
+				
        
+					
        The Javascript shown below is used to initialise the table shown in this example:
        $(document).ready(function() {
+	$('#example').dataTable( {
+		dom: 'Rlfrtip',
+		colReorder: {
+			realtime: true
+		}
+	} );
+} );
+
+					
        In addition to the above code, the following Javascript library files are loaded for use in this example:
        
+
+					
+				
        
+
+				
        
+					
        The HTML shown below is the raw HTML table element, before it has been enhanced by DataTables:
        
+				
        
+
+				
        
+					
        
+						
        This example uses a little bit of additional CSS beyond what is loaded from the library files (below), in order to correctly display the table. The
+						additional CSS used is shown below:
        
+					
        
+
+					
        The following CSS library files are loaded for use in this example to provide the styling of the table:
        
+
+					
+				
        
+
+				
        
+					
        This table loads data by Ajax. The latest data that has been loaded is shown below. This data will update automatically as any additional data is
+					loaded.
        
+				
        
+
+				
        
+					
        The script used to perform the server-side processing for this table is shown below. Please note that this is just an example script using PHP. Server-side
+					processing scripts can be written in any language, using the protocol described in the DataTables
+					documentation.
        
+				
        
+			
        
+		
        
+	
        
+
+	
        
+		
        
+			
        
+
+			
        
+				
        Other examples
        
+
+				
        
+					
        
+						
        Examples
        
+						
+					
        
+				
        
+
+				
        
+					
        Please refer to the DataTables documentation for full information about its API properties and methods.
        
+					Additionally, there are a wide range of extras and plug-ins
+					which extend the capabilities of DataTables.
        
+
+					
        DataTables designed and created by SpryMedia Ltd © 2007-2015
        
+					DataTables is licensed under the MIT license.
        
+				
        
+			
        
+		
        
+	
        
+
+
\ No newline at end of file
diff --git a/public/assets/plugins/datatables/extensions/ColReorder/examples/reset.html b/public/assets/plugins/datatables/extensions/ColReorder/examples/reset.html
new file mode 100644
index 00000000..b2e1fc08
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/ColReorder/examples/reset.html
@@ -0,0 +1,649 @@
+
+
+
+	
+	
+	
+
+	ColReorder example - Reset ordering API
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
        
+		
        
+			
        ColReorder example Reset ordering API
        
+
+			
        
+				
        One useful control option to present the end user when using ColReorder is the ability to reset the column ordering to that which was found in the HTML. This
+				can be done by calling the reset API function. While ColReorder does not provide a visual element for this itself (in order to provide maximum
+				flexibility) it is easy to hook to an event handler, as shown in this example.
        
+
+				
        For full information about the ColReorder API, please refer to the ColReorder API documentation.
        
+			

        
+			
        
+
+			
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+				
+			
        NamePositionOfficeAgeStart dateSalary
        NamePositionOfficeAgeStart dateSalary
        Tiger NixonSystem ArchitectEdinburgh612011/04/25$320,800
        Garrett WintersAccountantTokyo632011/07/25$170,750
        Ashton CoxJunior Technical AuthorSan Francisco662009/01/12$86,000
        Cedric KellySenior Javascript DeveloperEdinburgh222012/03/29$433,060
        Airi SatouAccountantTokyo332008/11/28$162,700
        Brielle WilliamsonIntegration SpecialistNew York612012/12/02$372,000
        Herrod ChandlerSales AssistantSan Francisco592012/08/06$137,500
        Rhona DavidsonIntegration SpecialistTokyo552010/10/14$327,900
        Colleen HurstJavascript DeveloperSan Francisco392009/09/15$205,500
        Sonya FrostSoftware EngineerEdinburgh232008/12/13$103,600
        Jena GainesOffice ManagerLondon302008/12/19$90,560
        Quinn FlynnSupport LeadEdinburgh222013/03/03$342,000
        Charde MarshallRegional DirectorSan Francisco362008/10/16$470,600
        Haley KennedySenior Marketing DesignerLondon432012/12/18$313,500
        Tatyana FitzpatrickRegional DirectorLondon192010/03/17$385,750
        Michael SilvaMarketing DesignerLondon662012/11/27$198,500
        Paul ByrdChief Financial Officer (CFO)New York642010/06/09$725,000
        Gloria LittleSystems AdministratorNew York592009/04/10$237,500
        Bradley GreerSoftware EngineerLondon412012/10/13$132,000
        Dai RiosPersonnel LeadEdinburgh352012/09/26$217,500
        Jenette CaldwellDevelopment LeadNew York302011/09/03$345,000
        Yuri BerryChief Marketing Officer (CMO)New York402009/06/25$675,000
        Caesar VancePre-Sales SupportNew York212011/12/12$106,450
        Doris WilderSales AssistantSidney232010/09/20$85,600
        Angelica RamosChief Executive Officer (CEO)London472009/10/09$1,200,000
        Gavin JoyceDeveloperEdinburgh422010/12/22$92,575
        Jennifer ChangRegional DirectorSingapore282010/11/14$357,650
        Brenden WagnerSoftware EngineerSan Francisco282011/06/07$206,850
        Fiona GreenChief Operating Officer (COO)San Francisco482010/03/11$850,000
        Shou ItouRegional MarketingTokyo202011/08/14$163,000
        Michelle HouseIntegration SpecialistSidney372011/06/02$95,400
        Suki BurksDeveloperLondon532009/10/22$114,500
        Prescott BartlettTechnical AuthorLondon272011/05/07$145,000
        Gavin CortezTeam LeaderSan Francisco222008/10/26$235,500
        Martena MccrayPost-Sales supportEdinburgh462011/03/09$324,050
        Unity ButlerMarketing DesignerSan Francisco472009/12/09$85,675
        Howard HatfieldOffice ManagerSan Francisco512008/12/16$164,500
        Hope FuentesSecretarySan Francisco412010/02/12$109,850
        Vivian HarrellFinancial ControllerSan Francisco622009/02/14$452,500
        Timothy MooneyOffice ManagerLondon372008/12/11$136,200
        Jackson BradshawDirectorNew York652008/09/26$645,750
        Olivia LiangSupport EngineerSingapore642011/02/03$234,500
        Bruno NashSoftware EngineerLondon382011/05/03$163,500
        Sakura YamamotoSupport EngineerTokyo372009/08/19$139,575
        Thor WaltonDeveloperNew York612013/08/11$98,540
        Finn CamachoSupport EngineerSan Francisco472009/07/07$87,500
        Serge BaldwinData CoordinatorSingapore642012/04/09$138,575
        Zenaida FrankSoftware EngineerNew York632010/01/04$125,250
        Zorita SerranoSoftware EngineerSan Francisco562012/06/01$115,000
        Jennifer AcostaJunior Javascript DeveloperEdinburgh432013/02/01$75,650
        Cara StevensSales AssistantNew York462011/12/06$145,600
        Hermione ButlerRegional DirectorLondon472011/03/21$356,250
        Lael GreerSystems AdministratorLondon212009/02/27$103,500
        Jonas AlexanderDeveloperSan Francisco302010/07/14$86,500
        Shad DeckerRegional DirectorEdinburgh512008/11/13$183,000
        Michael BruceJavascript DeveloperSingapore292011/06/27$183,000
        Donna SniderCustomer SupportNew York272011/01/25$112,000
        
+
+			
          
+				
        • Javascript
          • 
+				
        • HTML
          • 
+				
        • CSS
          • 
+				
        • Ajax
          • 
+				
        • Server-side script
          • 
+			
        
+
+			
        
+				
        
+					
        The Javascript shown below is used to initialise the table shown in this example:
        $(document).ready(function() {
+	var table = $('#example').DataTable( {
+		dom: 'Rlfrtip',
+		colReorder: {
+			order: [ 4, 3, 2, 1, 0 ]
+		}
+	} );
+	
+	$('#reset').click( function (e) {
+		e.preventDefault();
+		
+		table.colReorder.reset();
+	} );
+} );
+
+					
        In addition to the above code, the following Javascript library files are loaded for use in this example:
        
+
+					
+				
        
+
+				
        
+					
        The HTML shown below is the raw HTML table element, before it has been enhanced by DataTables:
        
+				
        
+
+				
        
+					
        
+						
        This example uses a little bit of additional CSS beyond what is loaded from the library files (below), in order to correctly display the table. The
+						additional CSS used is shown below:
        
+					
        
+
+					
        The following CSS library files are loaded for use in this example to provide the styling of the table:
        
+
+					
+				
        
+
+				
        
+					
        This table loads data by Ajax. The latest data that has been loaded is shown below. This data will update automatically as any additional data is
+					loaded.
        
+				
        
+
+				
        
+					
        The script used to perform the server-side processing for this table is shown below. Please note that this is just an example script using PHP. Server-side
+					processing scripts can be written in any language, using the protocol described in the DataTables
+					documentation.
        
+				
        
+			
        
+		
        
+	
        
+
+	
        
+		
        
+			
        
+
+			
        
+				
        Other examples
        
+
+				
        
+					
        
+						
        Examples
        
+						
+					
        
+				
        
+
+				
        
+					
        Please refer to the DataTables documentation for full information about its API properties and methods.
        
+					Additionally, there are a wide range of extras and plug-ins
+					which extend the capabilities of DataTables.
        
+
+					
        DataTables designed and created by SpryMedia Ltd © 2007-2015
        
+					DataTables is licensed under the MIT license.
        
+				
        
+			
        
+		
        
+	
        
+
+
\ No newline at end of file
diff --git a/public/assets/plugins/datatables/extensions/ColReorder/examples/scrolling.html b/public/assets/plugins/datatables/extensions/ColReorder/examples/scrolling.html
new file mode 100644
index 00000000..860e6655
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/ColReorder/examples/scrolling.html
@@ -0,0 +1,632 @@
+
+
+
+	
+	
+	
+
+	ColReorder example - Scrolling table
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
        
+		
        
+			
        ColReorder example Scrolling table
        
+
+			
        
+				
        This is a simple example to show ColReorder working with DataTables scrolling (scrollYDT and scrollXDT).
        
+			
        
+
+			
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+				
+			
        NamePositionOfficeAgeStart dateSalary
        NamePositionOfficeAgeStart dateSalary
        Tiger NixonSystem ArchitectEdinburgh612011/04/25$320,800
        Garrett WintersAccountantTokyo632011/07/25$170,750
        Ashton CoxJunior Technical AuthorSan Francisco662009/01/12$86,000
        Cedric KellySenior Javascript DeveloperEdinburgh222012/03/29$433,060
        Airi SatouAccountantTokyo332008/11/28$162,700
        Brielle WilliamsonIntegration SpecialistNew York612012/12/02$372,000
        Herrod ChandlerSales AssistantSan Francisco592012/08/06$137,500
        Rhona DavidsonIntegration SpecialistTokyo552010/10/14$327,900
        Colleen HurstJavascript DeveloperSan Francisco392009/09/15$205,500
        Sonya FrostSoftware EngineerEdinburgh232008/12/13$103,600
        Jena GainesOffice ManagerLondon302008/12/19$90,560
        Quinn FlynnSupport LeadEdinburgh222013/03/03$342,000
        Charde MarshallRegional DirectorSan Francisco362008/10/16$470,600
        Haley KennedySenior Marketing DesignerLondon432012/12/18$313,500
        Tatyana FitzpatrickRegional DirectorLondon192010/03/17$385,750
        Michael SilvaMarketing DesignerLondon662012/11/27$198,500
        Paul ByrdChief Financial Officer (CFO)New York642010/06/09$725,000
        Gloria LittleSystems AdministratorNew York592009/04/10$237,500
        Bradley GreerSoftware EngineerLondon412012/10/13$132,000
        Dai RiosPersonnel LeadEdinburgh352012/09/26$217,500
        Jenette CaldwellDevelopment LeadNew York302011/09/03$345,000
        Yuri BerryChief Marketing Officer (CMO)New York402009/06/25$675,000
        Caesar VancePre-Sales SupportNew York212011/12/12$106,450
        Doris WilderSales AssistantSidney232010/09/20$85,600
        Angelica RamosChief Executive Officer (CEO)London472009/10/09$1,200,000
        Gavin JoyceDeveloperEdinburgh422010/12/22$92,575
        Jennifer ChangRegional DirectorSingapore282010/11/14$357,650
        Brenden WagnerSoftware EngineerSan Francisco282011/06/07$206,850
        Fiona GreenChief Operating Officer (COO)San Francisco482010/03/11$850,000
        Shou ItouRegional MarketingTokyo202011/08/14$163,000
        Michelle HouseIntegration SpecialistSidney372011/06/02$95,400
        Suki BurksDeveloperLondon532009/10/22$114,500
        Prescott BartlettTechnical AuthorLondon272011/05/07$145,000
        Gavin CortezTeam LeaderSan Francisco222008/10/26$235,500
        Martena MccrayPost-Sales supportEdinburgh462011/03/09$324,050
        Unity ButlerMarketing DesignerSan Francisco472009/12/09$85,675
        Howard HatfieldOffice ManagerSan Francisco512008/12/16$164,500
        Hope FuentesSecretarySan Francisco412010/02/12$109,850
        Vivian HarrellFinancial ControllerSan Francisco622009/02/14$452,500
        Timothy MooneyOffice ManagerLondon372008/12/11$136,200
        Jackson BradshawDirectorNew York652008/09/26$645,750
        Olivia LiangSupport EngineerSingapore642011/02/03$234,500
        Bruno NashSoftware EngineerLondon382011/05/03$163,500
        Sakura YamamotoSupport EngineerTokyo372009/08/19$139,575
        Thor WaltonDeveloperNew York612013/08/11$98,540
        Finn CamachoSupport EngineerSan Francisco472009/07/07$87,500
        Serge BaldwinData CoordinatorSingapore642012/04/09$138,575
        Zenaida FrankSoftware EngineerNew York632010/01/04$125,250
        Zorita SerranoSoftware EngineerSan Francisco562012/06/01$115,000
        Jennifer AcostaJunior Javascript DeveloperEdinburgh432013/02/01$75,650
        Cara StevensSales AssistantNew York462011/12/06$145,600
        Hermione ButlerRegional DirectorLondon472011/03/21$356,250
        Lael GreerSystems AdministratorLondon212009/02/27$103,500
        Jonas AlexanderDeveloperSan Francisco302010/07/14$86,500
        Shad DeckerRegional DirectorEdinburgh512008/11/13$183,000
        Michael BruceJavascript DeveloperSingapore292011/06/27$183,000
        Donna SniderCustomer SupportNew York272011/01/25$112,000
        
+
+			
          
+				
        • Javascript
          • 
+				
        • HTML
          • 
+				
        • CSS
          • 
+				
        • Ajax
          • 
+				
        • Server-side script
          • 
+			
        
+
+			
        
+				
        
+					
        The Javascript shown below is used to initialise the table shown in this example:
        $(document).ready(function() {
+	$('#example').dataTable( {
+		dom:     'Rlfrtip',
+		scrollY: '200px',
+		paging:  false
+	} );
+} );
+
+					
        In addition to the above code, the following Javascript library files are loaded for use in this example:
        
+
+					
+				
        
+
+				
        
+					
        The HTML shown below is the raw HTML table element, before it has been enhanced by DataTables:
        
+				
        
+
+				
        
+					
        
+						
        This example uses a little bit of additional CSS beyond what is loaded from the library files (below), in order to correctly display the table. The
+						additional CSS used is shown below:
        
+					
        
+
+					
        The following CSS library files are loaded for use in this example to provide the styling of the table:
        
+
+					
+				
        
+
+				
        
+					
        This table loads data by Ajax. The latest data that has been loaded is shown below. This data will update automatically as any additional data is
+					loaded.
        
+				
        
+
+				
        
+					
        The script used to perform the server-side processing for this table is shown below. Please note that this is just an example script using PHP. Server-side
+					processing scripts can be written in any language, using the protocol described in the DataTables
+					documentation.
        
+				
        
+			
        
+		
        
+	
        
+
+	
        
+		
        
+			
        
+
+			
        
+				
        Other examples
        
+
+				
        
+					
        
+						
        Examples
        
+						
+					
        
+				
        
+
+				
        
+					
        Please refer to the DataTables documentation for full information about its API properties and methods.
        
+					Additionally, there are a wide range of extras and plug-ins
+					which extend the capabilities of DataTables.
        
+
+					
        DataTables designed and created by SpryMedia Ltd © 2007-2015
        
+					DataTables is licensed under the MIT license.
        
+				
        
+			
        
+		
        
+	
        
+
+
\ No newline at end of file
diff --git a/public/assets/plugins/datatables/extensions/ColReorder/examples/server_side.html b/public/assets/plugins/datatables/extensions/ColReorder/examples/server_side.html
new file mode 100644
index 00000000..f682b7ab
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/ColReorder/examples/server_side.html
@@ -0,0 +1,192 @@
+
+
+
+	
+	
+	
+
+	ColReorder example - Server-side processing
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
        
+		
        
+			
        ColReorder example Server-side processing
        
+
+			
        
+				
        Server-side processing can be exceptionally useful in DataTables when dealing with massive data sets, and ColReorder works with this as would be expected.
        
+
+				
        It is recommend that you use object based data with server-side processing and ColReorder, as this provides easily understandable mapping between the the
+				columns and the data relation on the server, otherwise you need to work out array indexes on each call!
        
+			
        
+
+			
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+			
        NamePositionOfficeExtn.Start dateSalary
        NamePositionOfficeExtn.Start dateSalary
        
+
+			
          
+				
        • Javascript
          • 
+				
        • HTML
          • 
+				
        • CSS
          • 
+				
        • Ajax
          • 
+				
        • Server-side script
          • 
+			
        
+
+			
        
+				
        
+					
        The Javascript shown below is used to initialise the table shown in this example:
        $(document).ready(function() {
+	$('#example').dataTable( {
+		dom: 'Rlfrtip',
+		processing: true,
+		serverSide: true,
+		ajax: "../../../examples/server_side/scripts/objects.php",
+		columns: [
+			{ data: "first_name" },
+			{ data: "last_name" },
+			{ data: "position" },
+			{ data: "office" },
+			{ data: "start_date" },
+			{ data: "salary" }
+		]
+	} );
+} );
+
+					
        In addition to the above code, the following Javascript library files are loaded for use in this example:
        
+
+					
+				
        
+
+				
        
+					
        The HTML shown below is the raw HTML table element, before it has been enhanced by DataTables:
        
+				
        
+
+				
        
+					
        
+						
        This example uses a little bit of additional CSS beyond what is loaded from the library files (below), in order to correctly display the table. The
+						additional CSS used is shown below:
        
+					
        
+
+					
        The following CSS library files are loaded for use in this example to provide the styling of the table:
        
+
+					
+				
        
+
+				
        
+					
        This table loads data by Ajax. The latest data that has been loaded is shown below. This data will update automatically as any additional data is
+					loaded.
        
+				
        
+
+				
        
+					
        The script used to perform the server-side processing for this table is shown below. Please note that this is just an example script using PHP. Server-side
+					processing scripts can be written in any language, using the protocol described in the DataTables
+					documentation.
        
+				
        
+			
        
+		
        
+	
        
+
+	
        
+		
        
+			
        
+
+			
        
+				
        Other examples
        
+
+				
        
+					
        
+						
        Examples
        
+						
+					
        
+				
        
+
+				
        
+					
        Please refer to the DataTables documentation for full information about its API properties and methods.
        
+					Additionally, there are a wide range of extras and plug-ins
+					which extend the capabilities of DataTables.
        
+
+					
        DataTables designed and created by SpryMedia Ltd © 2007-2015
        
+					DataTables is licensed under the MIT license.
        
+				
        
+			
        
+		
        
+	
        
+
+
\ No newline at end of file
diff --git a/public/assets/plugins/datatables/extensions/ColReorder/examples/simple.html b/public/assets/plugins/datatables/extensions/ColReorder/examples/simple.html
new file mode 100644
index 00000000..92cffee7
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/ColReorder/examples/simple.html
@@ -0,0 +1,630 @@
+
+
+
+	
+	
+	
+
+	ColReorder example - Basic initialisation
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
        
+		
        
+			
        ColReorder example Basic initialisation
        
+
+			
        
+				
        This example shows the basic use case of the ColReorder plug-in. With ColReorder enabled for a table, the user has the ability to click and drag any table
+				header cell, and drop it where they wish the column to be inserted. The insert point is shown visually, and the column reordering is done as soon as the mouse
+				button is released.
        
+
+				
        ColReorder is added to a DataTable through the R character that it adds to DataTables feature plug-ins. This means that you simply add the
+				character R to the domDT parameter for your table to add ColReorder - as shown in the example below.
        
+			
        
+
+			
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+				
+			
        NamePositionOfficeAgeStart dateSalary
        NamePositionOfficeAgeStart dateSalary
        Tiger NixonSystem ArchitectEdinburgh612011/04/25$320,800
        Garrett WintersAccountantTokyo632011/07/25$170,750
        Ashton CoxJunior Technical AuthorSan Francisco662009/01/12$86,000
        Cedric KellySenior Javascript DeveloperEdinburgh222012/03/29$433,060
        Airi SatouAccountantTokyo332008/11/28$162,700
        Brielle WilliamsonIntegration SpecialistNew York612012/12/02$372,000
        Herrod ChandlerSales AssistantSan Francisco592012/08/06$137,500
        Rhona DavidsonIntegration SpecialistTokyo552010/10/14$327,900
        Colleen HurstJavascript DeveloperSan Francisco392009/09/15$205,500
        Sonya FrostSoftware EngineerEdinburgh232008/12/13$103,600
        Jena GainesOffice ManagerLondon302008/12/19$90,560
        Quinn FlynnSupport LeadEdinburgh222013/03/03$342,000
        Charde MarshallRegional DirectorSan Francisco362008/10/16$470,600
        Haley KennedySenior Marketing DesignerLondon432012/12/18$313,500
        Tatyana FitzpatrickRegional DirectorLondon192010/03/17$385,750
        Michael SilvaMarketing DesignerLondon662012/11/27$198,500
        Paul ByrdChief Financial Officer (CFO)New York642010/06/09$725,000
        Gloria LittleSystems AdministratorNew York592009/04/10$237,500
        Bradley GreerSoftware EngineerLondon412012/10/13$132,000
        Dai RiosPersonnel LeadEdinburgh352012/09/26$217,500
        Jenette CaldwellDevelopment LeadNew York302011/09/03$345,000
        Yuri BerryChief Marketing Officer (CMO)New York402009/06/25$675,000
        Caesar VancePre-Sales SupportNew York212011/12/12$106,450
        Doris WilderSales AssistantSidney232010/09/20$85,600
        Angelica RamosChief Executive Officer (CEO)London472009/10/09$1,200,000
        Gavin JoyceDeveloperEdinburgh422010/12/22$92,575
        Jennifer ChangRegional DirectorSingapore282010/11/14$357,650
        Brenden WagnerSoftware EngineerSan Francisco282011/06/07$206,850
        Fiona GreenChief Operating Officer (COO)San Francisco482010/03/11$850,000
        Shou ItouRegional MarketingTokyo202011/08/14$163,000
        Michelle HouseIntegration SpecialistSidney372011/06/02$95,400
        Suki BurksDeveloperLondon532009/10/22$114,500
        Prescott BartlettTechnical AuthorLondon272011/05/07$145,000
        Gavin CortezTeam LeaderSan Francisco222008/10/26$235,500
        Martena MccrayPost-Sales supportEdinburgh462011/03/09$324,050
        Unity ButlerMarketing DesignerSan Francisco472009/12/09$85,675
        Howard HatfieldOffice ManagerSan Francisco512008/12/16$164,500
        Hope FuentesSecretarySan Francisco412010/02/12$109,850
        Vivian HarrellFinancial ControllerSan Francisco622009/02/14$452,500
        Timothy MooneyOffice ManagerLondon372008/12/11$136,200
        Jackson BradshawDirectorNew York652008/09/26$645,750
        Olivia LiangSupport EngineerSingapore642011/02/03$234,500
        Bruno NashSoftware EngineerLondon382011/05/03$163,500
        Sakura YamamotoSupport EngineerTokyo372009/08/19$139,575
        Thor WaltonDeveloperNew York612013/08/11$98,540
        Finn CamachoSupport EngineerSan Francisco472009/07/07$87,500
        Serge BaldwinData CoordinatorSingapore642012/04/09$138,575
        Zenaida FrankSoftware EngineerNew York632010/01/04$125,250
        Zorita SerranoSoftware EngineerSan Francisco562012/06/01$115,000
        Jennifer AcostaJunior Javascript DeveloperEdinburgh432013/02/01$75,650
        Cara StevensSales AssistantNew York462011/12/06$145,600
        Hermione ButlerRegional DirectorLondon472011/03/21$356,250
        Lael GreerSystems AdministratorLondon212009/02/27$103,500
        Jonas AlexanderDeveloperSan Francisco302010/07/14$86,500
        Shad DeckerRegional DirectorEdinburgh512008/11/13$183,000
        Michael BruceJavascript DeveloperSingapore292011/06/27$183,000
        Donna SniderCustomer SupportNew York272011/01/25$112,000
        
+
+			
          
+				
        • Javascript
          • 
+				
        • HTML
          • 
+				
        • CSS
          • 
+				
        • Ajax
          • 
+				
        • Server-side script
          • 
+			
        
+
+			
        
+				
        
+					
        The Javascript shown below is used to initialise the table shown in this example:
        $(document).ready(function() {
+	$('#example').DataTable( {
+		dom: 'Rlfrtip'
+	} );
+} );
+
+					
        In addition to the above code, the following Javascript library files are loaded for use in this example:
        
+
+					
+				
        
+
+				
        
+					
        The HTML shown below is the raw HTML table element, before it has been enhanced by DataTables:
        
+				
        
+
+				
        
+					
        
+						
        This example uses a little bit of additional CSS beyond what is loaded from the library files (below), in order to correctly display the table. The
+						additional CSS used is shown below:
        
+					
        
+
+					
        The following CSS library files are loaded for use in this example to provide the styling of the table:
        
+
+					
+				
        
+
+				
        
+					
        This table loads data by Ajax. The latest data that has been loaded is shown below. This data will update automatically as any additional data is
+					loaded.
        
+				
        
+
+				
        
+					
        The script used to perform the server-side processing for this table is shown below. Please note that this is just an example script using PHP. Server-side
+					processing scripts can be written in any language, using the protocol described in the DataTables
+					documentation.
        
+				
        
+			
        
+		
        
+	
        
+
+	
        
+		
        
+			
        
+
+			
        
+				
        Other examples
        
+
+				
        
+					
        
+						
        Examples
        
+						
+					
        
+				
        
+
+				
        
+					
        Please refer to the DataTables documentation for full information about its API properties and methods.
        
+					Additionally, there are a wide range of extras and plug-ins
+					which extend the capabilities of DataTables.
        
+
+					
        DataTables designed and created by SpryMedia Ltd © 2007-2015
        
+					DataTables is licensed under the MIT license.
        
+				
        
+			
        
+		
        
+	
        
+
+
\ No newline at end of file
diff --git a/public/assets/plugins/datatables/extensions/ColReorder/examples/state_save.html b/public/assets/plugins/datatables/extensions/ColReorder/examples/state_save.html
new file mode 100644
index 00000000..6e4e2e9e
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/ColReorder/examples/state_save.html
@@ -0,0 +1,631 @@
+
+
+
+	
+	
+	
+
+	ColReorder example - State saving
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
        
+		
        
+			
        ColReorder example State saving
        
+
+			
        
+				
        A useful interaction pattern to use in DataTables is state saving, so when the end user reloads or revisits a page its previous state is retained. ColReorder
+				works seamlessly with state saving in DataTables (stateSaveDT), remembering and restoring the column positions, as well as everything else such as sorting
+				and filtering.
        
+			
        
+
+			
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+				
+			
        NamePositionOfficeAgeStart dateSalary
        NamePositionOfficeAgeStart dateSalary
        Tiger NixonSystem ArchitectEdinburgh612011/04/25$320,800
        Garrett WintersAccountantTokyo632011/07/25$170,750
        Ashton CoxJunior Technical AuthorSan Francisco662009/01/12$86,000
        Cedric KellySenior Javascript DeveloperEdinburgh222012/03/29$433,060
        Airi SatouAccountantTokyo332008/11/28$162,700
        Brielle WilliamsonIntegration SpecialistNew York612012/12/02$372,000
        Herrod ChandlerSales AssistantSan Francisco592012/08/06$137,500
        Rhona DavidsonIntegration SpecialistTokyo552010/10/14$327,900
        Colleen HurstJavascript DeveloperSan Francisco392009/09/15$205,500
        Sonya FrostSoftware EngineerEdinburgh232008/12/13$103,600
        Jena GainesOffice ManagerLondon302008/12/19$90,560
        Quinn FlynnSupport LeadEdinburgh222013/03/03$342,000
        Charde MarshallRegional DirectorSan Francisco362008/10/16$470,600
        Haley KennedySenior Marketing DesignerLondon432012/12/18$313,500
        Tatyana FitzpatrickRegional DirectorLondon192010/03/17$385,750
        Michael SilvaMarketing DesignerLondon662012/11/27$198,500
        Paul ByrdChief Financial Officer (CFO)New York642010/06/09$725,000
        Gloria LittleSystems AdministratorNew York592009/04/10$237,500
        Bradley GreerSoftware EngineerLondon412012/10/13$132,000
        Dai RiosPersonnel LeadEdinburgh352012/09/26$217,500
        Jenette CaldwellDevelopment LeadNew York302011/09/03$345,000
        Yuri BerryChief Marketing Officer (CMO)New York402009/06/25$675,000
        Caesar VancePre-Sales SupportNew York212011/12/12$106,450
        Doris WilderSales AssistantSidney232010/09/20$85,600
        Angelica RamosChief Executive Officer (CEO)London472009/10/09$1,200,000
        Gavin JoyceDeveloperEdinburgh422010/12/22$92,575
        Jennifer ChangRegional DirectorSingapore282010/11/14$357,650
        Brenden WagnerSoftware EngineerSan Francisco282011/06/07$206,850
        Fiona GreenChief Operating Officer (COO)San Francisco482010/03/11$850,000
        Shou ItouRegional MarketingTokyo202011/08/14$163,000
        Michelle HouseIntegration SpecialistSidney372011/06/02$95,400
        Suki BurksDeveloperLondon532009/10/22$114,500
        Prescott BartlettTechnical AuthorLondon272011/05/07$145,000
        Gavin CortezTeam LeaderSan Francisco222008/10/26$235,500
        Martena MccrayPost-Sales supportEdinburgh462011/03/09$324,050
        Unity ButlerMarketing DesignerSan Francisco472009/12/09$85,675
        Howard HatfieldOffice ManagerSan Francisco512008/12/16$164,500
        Hope FuentesSecretarySan Francisco412010/02/12$109,850
        Vivian HarrellFinancial ControllerSan Francisco622009/02/14$452,500
        Timothy MooneyOffice ManagerLondon372008/12/11$136,200
        Jackson BradshawDirectorNew York652008/09/26$645,750
        Olivia LiangSupport EngineerSingapore642011/02/03$234,500
        Bruno NashSoftware EngineerLondon382011/05/03$163,500
        Sakura YamamotoSupport EngineerTokyo372009/08/19$139,575
        Thor WaltonDeveloperNew York612013/08/11$98,540
        Finn CamachoSupport EngineerSan Francisco472009/07/07$87,500
        Serge BaldwinData CoordinatorSingapore642012/04/09$138,575
        Zenaida FrankSoftware EngineerNew York632010/01/04$125,250
        Zorita SerranoSoftware EngineerSan Francisco562012/06/01$115,000
        Jennifer AcostaJunior Javascript DeveloperEdinburgh432013/02/01$75,650
        Cara StevensSales AssistantNew York462011/12/06$145,600
        Hermione ButlerRegional DirectorLondon472011/03/21$356,250
        Lael GreerSystems AdministratorLondon212009/02/27$103,500
        Jonas AlexanderDeveloperSan Francisco302010/07/14$86,500
        Shad DeckerRegional DirectorEdinburgh512008/11/13$183,000
        Michael BruceJavascript DeveloperSingapore292011/06/27$183,000
        Donna SniderCustomer SupportNew York272011/01/25$112,000
        
+
+			
          
+				
        • Javascript
          • 
+				
        • HTML
          • 
+				
        • CSS
          • 
+				
        • Ajax
          • 
+				
        • Server-side script
          • 
+			
        
+
+			
        
+				
        
+					
        The Javascript shown below is used to initialise the table shown in this example:
        $(document).ready(function() {
+	$('#example').dataTable( {
+		dom: 'Rlfrtip',
+		stateSave: true
+	} );
+} );
+
+					
        In addition to the above code, the following Javascript library files are loaded for use in this example:
        
+
+					
+				
        
+
+				
        
+					
        The HTML shown below is the raw HTML table element, before it has been enhanced by DataTables:
        
+				
        
+
+				
        
+					
        
+						
        This example uses a little bit of additional CSS beyond what is loaded from the library files (below), in order to correctly display the table. The
+						additional CSS used is shown below:
        
+					
        
+
+					
        The following CSS library files are loaded for use in this example to provide the styling of the table:
        
+
+					
+				
        
+
+				
        
+					
        This table loads data by Ajax. The latest data that has been loaded is shown below. This data will update automatically as any additional data is
+					loaded.
        
+				
        
+
+				
        
+					
        The script used to perform the server-side processing for this table is shown below. Please note that this is just an example script using PHP. Server-side
+					processing scripts can be written in any language, using the protocol described in the DataTables
+					documentation.
        
+				
        
+			
        
+		
        
+	
        
+
+	
        
+		
        
+			
        
+
+			
        
+				
        Other examples
        
+
+				
        
+					
        
+						
        Examples
        
+						
+					
        
+				
        
+
+				
        
+					
        Please refer to the DataTables documentation for full information about its API properties and methods.
        
+					Additionally, there are a wide range of extras and plug-ins
+					which extend the capabilities of DataTables.
        
+
+					
        DataTables designed and created by SpryMedia Ltd © 2007-2015
        
+					DataTables is licensed under the MIT license.
        
+				
        
+			
        
+		
        
+	
        
+
+
\ No newline at end of file
diff --git a/public/assets/plugins/datatables/extensions/ColReorder/images/insert.png b/public/assets/plugins/datatables/extensions/ColReorder/images/insert.png
new file mode 100644
index 0000000000000000000000000000000000000000..15d5522da64f4f036c5a717dbb320799884fa12b
GIT binary patch
literal 1885
zcmaJ?Yfuwc6ke)>fRTqUjALP&*xC`v?j}Y`Bs^n)nFNqTMNwhdEF?m*%Vv>?mPoZ#
zs@74ainfY%Y-t(Plw!alqNXAbBPu#pi$zL{3SvNQVEafum8T(P?s-2qUyS)Q#a8v?Rj@fQTpqiDJ1p4QAmv8l9M9YiQzt
z8kLx{LMVsjWE`&6BotA&q9{p;73E^#Do#`+7-0}G0$Q9#L4!6=rxzK-oR_*HX6@dF
zIN(bNoh#=2Z7NNk0>%*(4hng2CU&fu`OnL+{@Qv%LK0nAJ;L{PBCL0mV5CH=C)i*l*A|vcd}CQ%gxXLOs9De@MJ3-+U->UezzfZ4b
zJDpe>ABVV|6;VdEdGHKsX=!PJ>v9@Kn~W|t@WyrzRlm8j!&R9aK9bS8z6zK&X|cdk
z*(77liTIq=RO}i#|HFm0nxSBe(bFG(ia4%38}6-pu1!C&>BfqCSbhBfpBoJzRUTSQ
zm7Qg(Nfq@x`UWc=xE=VBUxg8Ic-%RIosS7P;!Uh9cDzt5GOklknin#ycXYRrU4CE|
zd$TWUO6kcl3|5c!4{xbs?flrRU`H?4s1pw-wweTIpA2y=pZP_xi=8j5CVdaeo;kCx
z(tk-bKt*14vAi{ASD-a&`MJw2@Sf6A?*)_G)f?Y;4X0-gR}b0!GK#VKi3=ZE_Ghqe
zC3i1&{&9O_i06@;3l>z%ShA*B2V6BZ$R?+2OUa%she~$r`LN_r*{;%n2WMT;A?0bC
z`G
z$-ze_iKgC|tjs8iGDTVw(z83-tuF}mA!xKU7Y;POO_fxlS=Wuy<;@5X<$
zW1h_i22Tfo(RY9K>y%8tG;C|wxZ=bgbB+n;_JiJU%?zB{DVbgO&K;l0($f4)EPvm-
zlN+v;S_1+DEnC0R!389oRr~E*Q?J+FnOR@k)fi;I|7kZj<@(pq>4t}An{4){BaxAZ
zH%?gQRj|6J@`?R=a0O2#7_@L5=9|4}Mg4|&WxZ+J_C6!DEOJHrsga0gds4A--}I0z
z0(Ir4@~w0iFvTagY;*62was1uOG}S><-aM}(OOpiY_D=(P^td<#@N~37i`nIC&zj2
z-9OcH-N+i&oP*rA;o^%IAVsoIPshsTvIhr)6zGqqehOLDU-LWl=f%4@inL4pE0-{K*64}5NYR>RpukMimF|MslT0q9QPlIW+biD--V00;u>>pd3$=G
z{Kl$ZDq^cRN%8jvq^Ez>n1dg9+UCz6?K>R94Vrd)F*dL}C`am-a4hC=-mPt|!i%1t
zRh%7suNYZ#gZ)K~K71uGOct$wqWyvtM1FoR?S1=~=?;@Hx$tqLv>m;F{CSiA
v3v1c-1AQT_MP7}WOBDevGdhR%UqvP!KOI{pd-r?y4=-^^lH^2e<_CWP6QK!R

literal 0
HcmV?d00001

diff --git a/public/assets/plugins/datatables/extensions/ColReorder/js/dataTables.colReorder.js b/public/assets/plugins/datatables/extensions/ColReorder/js/dataTables.colReorder.js
new file mode 100644
index 00000000..c3b2f1e2
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/ColReorder/js/dataTables.colReorder.js
@@ -0,0 +1,1372 @@
+/*! ColReorder 1.1.3
+ * ©2010-2014 SpryMedia Ltd - datatables.net/license
+ */
+
+/**
+ * @summary     ColReorder
+ * @description Provide the ability to reorder columns in a DataTable
+ * @version     1.1.3
+ * @file        dataTables.colReorder.js
+ * @author      SpryMedia Ltd (www.sprymedia.co.uk)
+ * @contact     www.sprymedia.co.uk/contact
+ * @copyright   Copyright 2010-2014 SpryMedia Ltd.
+ *
+ * This source file is free software, available under the following license:
+ *   MIT license - http://datatables.net/license/mit
+ *
+ * This source file is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the license files for details.
+ *
+ * For details please refer to: http://www.datatables.net
+ */
+
+(function(window, document, undefined) {
+
+
+/**
+ * Switch the key value pairing of an index array to be value key (i.e. the old value is now the
+ * key). For example consider [ 2, 0, 1 ] this would be returned as [ 1, 2, 0 ].
+ *  @method  fnInvertKeyValues
+ *  @param   array aIn Array to switch around
+ *  @returns array
+ */
+function fnInvertKeyValues( aIn )
+{
+	var aRet=[];
+	for ( var i=0, iLen=aIn.length ; i= iCols )
+	{
+		this.oApi._fnLog( oSettings, 1, "ColReorder 'from' index is out of bounds: "+iFrom );
+		return;
+	}
+
+	if ( iTo < 0 || iTo >= iCols )
+	{
+		this.oApi._fnLog( oSettings, 1, "ColReorder 'to' index is out of bounds: "+iTo );
+		return;
+	}
+
+	/*
+	 * Calculate the new column array index, so we have a mapping between the old and new
+	 */
+	var aiMapping = [];
+	for ( i=0, iLen=iCols ; i this.s.fixed-1 && i < iLen - this.s.fixedRight )
+			{
+				this._fnMouseListener( i, this.s.dt.aoColumns[i].nTh );
+			}
+
+			/* Mark the original column order for later reference */
+			this.s.dt.aoColumns[i]._ColReorder_iOrigCol = i;
+		}
+
+		/* State saving */
+		this.s.dt.oApi._fnCallbackReg( this.s.dt, 'aoStateSaveParams', function (oS, oData) {
+			that._fnStateSave.call( that, oData );
+		}, "ColReorder_State" );
+
+		/* An initial column order has been specified */
+		var aiOrder = null;
+		if ( this.s.init.aiOrder )
+		{
+			aiOrder = this.s.init.aiOrder.slice();
+		}
+
+		/* State loading, overrides the column order given */
+		if ( this.s.dt.oLoadedState && typeof this.s.dt.oLoadedState.ColReorder != 'undefined' &&
+		  this.s.dt.oLoadedState.ColReorder.length == this.s.dt.aoColumns.length )
+		{
+			aiOrder = this.s.dt.oLoadedState.ColReorder;
+		}
+
+		/* If we have an order to apply - do so */
+		if ( aiOrder )
+		{
+			/* We might be called during or after the DataTables initialisation. If before, then we need
+			 * to wait until the draw is done, if after, then do what we need to do right away
+			 */
+			if ( !that.s.dt._bInitComplete )
+			{
+				var bDone = false;
+				this.s.dt.aoDrawCallback.push( {
+					"fn": function () {
+						if ( !that.s.dt._bInitComplete && !bDone )
+						{
+							bDone = true;
+							var resort = fnInvertKeyValues( aiOrder );
+							that._fnOrderColumns.call( that, resort );
+						}
+					},
+					"sName": "ColReorder_Pre"
+				} );
+			}
+			else
+			{
+				var resort = fnInvertKeyValues( aiOrder );
+				that._fnOrderColumns.call( that, resort );
+			}
+		}
+		else {
+			this._fnSetColumnIndexes();
+		}
+	},
+
+
+	/**
+	 * Set the column order from an array
+	 *  @method  _fnOrderColumns
+	 *  @param   array a An array of integers which dictate the column order that should be applied
+	 *  @returns void
+	 *  @private
+	 */
+	"_fnOrderColumns": function ( a )
+	{
+		if ( a.length != this.s.dt.aoColumns.length )
+		{
+			this.s.dt.oInstance.oApi._fnLog( this.s.dt, 1, "ColReorder - array reorder does not "+
+				"match known number of columns. Skipping." );
+			return;
+		}
+
+		for ( var i=0, iLen=a.length ; i
        ')
+			.addClass( 'DTCR_pointer' )
+			.css( {
+				position: 'absolute',
+				top: scrolling ?
+					$('div.dataTables_scroll', this.s.dt.nTableWrapper).offset().top :
+					$(this.s.dt.nTable).offset().top,
+				height : scrolling ?
+					$('div.dataTables_scroll', this.s.dt.nTableWrapper).height() :
+					$(this.s.dt.nTable).height()
+			} )
+			.appendTo( 'body' );
+	},
+
+	/**
+	 * Clean up ColReorder memory references and event handlers
+	 *  @method  _fnDestroy
+	 *  @returns void
+	 *  @private
+	 */
+	"_fnDestroy": function ()
+	{
+		var i, iLen;
+
+		for ( i=0, iLen=this.s.dt.aoDrawCallback.length ; ib||b>=n)this.oApi._fnLog(a,1,"ColReorder 'from' index is out of bounds: "+b);else if(0>e||e>=n)this.oApi._fnLog(a,1,"ColReorder 'to' index is out of bounds: "+e);else{f=[];c=0;for(g=n;cthis.s.fixed-1&&eMath.pow(Math.pow(a.pageX-this.s.mouse.startX,2)+Math.pow(a.pageY-this.s.mouse.startY,2),0.5))return;this._fnCreateDragNode()}this.dom.drag.css({left:a.pageX-this.s.mouse.offsetX,top:a.pageY-this.s.mouse.offsetY});for(var b=!1,e=this.s.mouse.toIndex,d=1,c=this.s.aoTargets.length;d
        ").addClass("DTCR_pointer").css({position:"absolute",top:a?d("div.dataTables_scroll",this.s.dt.nTableWrapper).offset().top:d(this.s.dt.nTable).offset().top,height:a?d("div.dataTables_scroll",this.s.dt.nTableWrapper).height():
+d(this.s.dt.nTable).height()}).appendTo("body")},_fnDestroy:function(){var a,b;a=0;for(b=this.s.dt.aoDrawCallback.length;a
    • ')[0],
+g=c.childNodes[0],f=c.childNodes[1];this.dom.grid.dt.parentNode.insertBefore(c,this.dom.grid.dt);c.appendChild(this.dom.grid.dt);this.dom.grid.wrapper=c;0b.clientWidth&&(c.x=!0);a.offsetHeight>b.clientHeight&&(c.y=!0);return c},_fnDraw:function(a){this._fnGridLayout();this._fnCloneLeft(a);this._fnCloneRight(a);null!==this.s.fnDrawCallback&&this.s.fnDrawCallback.call(this,this.dom.clone.left,this.dom.clone.right);d(this).trigger("draw.dtfc",{leftClone:this.dom.clone.left,rightClone:this.dom.clone.right})},_fnCloneRight:function(a){if(!(0>=
+this.s.iRightColumns)){var b,c=[];for(b=this.s.iTableColumns-this.s.iRightColumns;b=this.s.iLeftColumns)){var b,c=[];for(b=0;bthead",a.header);k.empty();e=0;for(h=n.length;ethead",a.header)[0]);e=0;for(h=n.length;etbody>tr",f.dom.body).css("height","auto");null!==a.body&&(a.body.parentNode.removeChild(a.body),a.body=null);a.body=d(this.dom.body).clone(!0)[0];a.body.className+=" DTFC_Cloned";a.body.style.paddingBottom=l.oScroll.iBarWidth+"px";a.body.style.marginBottom=2*l.oScroll.iBarWidth+"px";null!==a.body.getAttribute("id")&&a.body.removeAttribute("id");d(">thead>tr",a.body).empty();d(">tfoot",
+a.body).remove();var p=d("tbody",a.body)[0];d(p).empty();if(0thead>tr",a.body)[0];for(o=0;otbody>tr",f.dom.body).each(function(a){var b=this.cloneNode(false);b.removeAttribute("id");a=f.s.dt.aoData[f.s.dt.oFeatures.bServerSide===false?f.s.dt.aiDisplay[f.s.dt._iDisplayStart+
+a]:a].anCells||d(this).children("td, th");for(o=0;o0){m=d(a[j]).clone(true,true)[0];b.appendChild(m)}}p.appendChild(b)})}else d(">tbody>tr",f.dom.body).each(function(){m=this.cloneNode(true);m.className=m.className+" DTFC_NoData";d("td",m).html("");p.appendChild(m)});a.body.style.width="100%";a.body.style.margin="0";a.body.style.padding="0";l.oScroller!==t&&(h=l.oScroller.dom.force,b.forcer?b.forcer.style.height=h.style.height:(b.forcer=h.cloneNode(!0),b.liner.appendChild(b.forcer)));
+b.liner.appendChild(a.body);this._fnEqualiseHeights("tbody",f.dom.body,a.body);if(null!==l.nTFoot){if(g){null!==a.footer&&a.footer.parentNode.removeChild(a.footer);a.footer=d(this.dom.footer).clone(!0,!0)[0];a.footer.className+=" DTFC_Cloned";a.footer.style.width="100%";b.foot.appendChild(a.footer);n=this._fnCopyLayout(l.aoFooter,c);b=d(">tfoot",a.footer);b.empty();e=0;for(h=n.length;etfoot",a.footer)[0]);e=0;for(h=n.length;ethead",a.header)[0]);d(b).each(function(a){j=c[a];this.style.width=f.s.aiInnerWidths[j]+"px"});null!==f.s.dt.nTFoot&&(b=l.oApi._fnGetUniqueThs(l,d(">tfoot",a.footer)[0]),d(b).each(function(a){j=c[a];this.style.width=f.s.aiInnerWidths[j]+"px"}))},_fnGetTrNodes:function(a){for(var b=
+[],c=0,d=a.childNodes.length;c"+a+">tr:eq(0)",b).children(":first");a.outerHeight();a.height();for(var e=this._fnGetTrNodes(e),b=this._fnGetTrNodes(c),h=[],c=0,a=b.length;cg?f:g,"semiauto"==this.s.sHeightMatch&&
+(e[c]._DTTC_iHeight=g),h.push(g);c=0;for(a=b.length;c
+
+
+	
+	
+	
+
+	FixedHeader example - Header and footer fixed
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
    
+		
    
+			
    FixedHeader example Header and footer fixed
    
+
+			
    
+				
    FixedHeader provides the ability to fix in place the header, footer, left and right columns of the
+				table. These are controlled by the options:
    
+
+				
      
+					
    • top - default true
      • 
+					
    • bottom - default false
      • 
+					
    • left - default false
      • 
+					
    • right - default false
      • 
+				
    
+
+				
    This example shows the header and footer of the table fixed by enabling the bottom
+				option.
    
+			
    
+
+			
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+				
+			
    NamePositionOfficeAgeStart dateSalary
    NamePositionOfficeAgeStart dateSalary
    Tiger NixonSystem ArchitectEdinburgh612011/04/25$320,800
    Garrett WintersAccountantTokyo632011/07/25$170,750
    Ashton CoxJunior Technical AuthorSan Francisco662009/01/12$86,000
    Cedric KellySenior Javascript DeveloperEdinburgh222012/03/29$433,060
    Airi SatouAccountantTokyo332008/11/28$162,700
    Brielle WilliamsonIntegration SpecialistNew York612012/12/02$372,000
    Herrod ChandlerSales AssistantSan Francisco592012/08/06$137,500
    Rhona DavidsonIntegration SpecialistTokyo552010/10/14$327,900
    Colleen HurstJavascript DeveloperSan Francisco392009/09/15$205,500
    Sonya FrostSoftware EngineerEdinburgh232008/12/13$103,600
    Jena GainesOffice ManagerLondon302008/12/19$90,560
    Quinn FlynnSupport LeadEdinburgh222013/03/03$342,000
    Charde MarshallRegional DirectorSan Francisco362008/10/16$470,600
    Haley KennedySenior Marketing DesignerLondon432012/12/18$313,500
    Tatyana FitzpatrickRegional DirectorLondon192010/03/17$385,750
    Michael SilvaMarketing DesignerLondon662012/11/27$198,500
    Paul ByrdChief Financial Officer (CFO)New York642010/06/09$725,000
    Gloria LittleSystems AdministratorNew York592009/04/10$237,500
    Bradley GreerSoftware EngineerLondon412012/10/13$132,000
    Dai RiosPersonnel LeadEdinburgh352012/09/26$217,500
    Jenette CaldwellDevelopment LeadNew York302011/09/03$345,000
    Yuri BerryChief Marketing Officer (CMO)New York402009/06/25$675,000
    Caesar VancePre-Sales SupportNew York212011/12/12$106,450
    Doris WilderSales AssistantSidney232010/09/20$85,600
    Angelica RamosChief Executive Officer (CEO)London472009/10/09$1,200,000
    Gavin JoyceDeveloperEdinburgh422010/12/22$92,575
    Jennifer ChangRegional DirectorSingapore282010/11/14$357,650
    Brenden WagnerSoftware EngineerSan Francisco282011/06/07$206,850
    Fiona GreenChief Operating Officer (COO)San Francisco482010/03/11$850,000
    Shou ItouRegional MarketingTokyo202011/08/14$163,000
    Michelle HouseIntegration SpecialistSidney372011/06/02$95,400
    Suki BurksDeveloperLondon532009/10/22$114,500
    Prescott BartlettTechnical AuthorLondon272011/05/07$145,000
    Gavin CortezTeam LeaderSan Francisco222008/10/26$235,500
    Martena MccrayPost-Sales supportEdinburgh462011/03/09$324,050
    Unity ButlerMarketing DesignerSan Francisco472009/12/09$85,675
    Howard HatfieldOffice ManagerSan Francisco512008/12/16$164,500
    Hope FuentesSecretarySan Francisco412010/02/12$109,850
    Vivian HarrellFinancial ControllerSan Francisco622009/02/14$452,500
    Timothy MooneyOffice ManagerLondon372008/12/11$136,200
    Jackson BradshawDirectorNew York652008/09/26$645,750
    Olivia LiangSupport EngineerSingapore642011/02/03$234,500
    Bruno NashSoftware EngineerLondon382011/05/03$163,500
    Sakura YamamotoSupport EngineerTokyo372009/08/19$139,575
    Thor WaltonDeveloperNew York612013/08/11$98,540
    Finn CamachoSupport EngineerSan Francisco472009/07/07$87,500
    Serge BaldwinData CoordinatorSingapore642012/04/09$138,575
    Zenaida FrankSoftware EngineerNew York632010/01/04$125,250
    Zorita SerranoSoftware EngineerSan Francisco562012/06/01$115,000
    Jennifer AcostaJunior Javascript DeveloperEdinburgh432013/02/01$75,650
    Cara StevensSales AssistantNew York462011/12/06$145,600
    Hermione ButlerRegional DirectorLondon472011/03/21$356,250
    Lael GreerSystems AdministratorLondon212009/02/27$103,500
    Jonas AlexanderDeveloperSan Francisco302010/07/14$86,500
    Shad DeckerRegional DirectorEdinburgh512008/11/13$183,000
    Michael BruceJavascript DeveloperSingapore292011/06/27$183,000
    Donna SniderCustomer SupportNew York272011/01/25$112,000
    
+
+			
      
+				
    • Javascript
      • 
+				
    • HTML
      • 
+				
    • CSS
      • 
+				
    • Ajax
      • 
+				
    • Server-side script
      • 
+			
    
+
+			
    
+				
    
+					
    The Javascript shown below is used to initialise the table shown in this
+					example:
    $(document).ready(function() {
+	var table = $('#example').DataTable();
+
+	new $.fn.dataTable.FixedHeader( table, {
+		bottom: true
+	} );
+} );
+
+					
    In addition to the above code, the following Javascript library files are loaded for use in this
+					example:
    
+
+					
+				
    
+
+				
    
+					
    The HTML shown below is the raw HTML table element, before it has been enhanced by
+					DataTables:
    
+				
    
+
+				
    
+					
    
+						
    This example uses a little bit of additional CSS beyond what is loaded from the library
+						files (below), in order to correctly display the table. The additional CSS used is shown
+						below:
    
+					
    
+
+					
    The following CSS library files are loaded for use in this example to provide the styling of the
+					table:
    
+
+					
+				
    
+
+				
    
+					
    This table loads data by Ajax. The latest data that has been loaded is shown below. This data
+					will update automatically as any additional data is loaded.
    
+				
    
+
+				
    
+					
    The script used to perform the server-side processing for this table is shown below. Please note
+					that this is just an example script using PHP. Server-side processing scripts can be written in any
+					language, using the protocol described in the
+					DataTables documentation.
    
+				
    
+			
    
+		
    
+	
    
+
+	
    
+		
    
+			
    
+
+			
    
+				
    Other examples
    
+
+				
    
+					
    
+						
    Examples
    
+						
+					
    
+				
    
+
+				
    
+					
    Please refer to the DataTables documentation for full
+					information about its API properties and methods.
    
+					Additionally, there are a wide range of extras and
+					plug-ins which extend the capabilities of
+					DataTables.
    
+
+					
    DataTables designed and created by SpryMedia Ltd © 2007-2014
    
+					DataTables is licensed under the MIT license.
    
+				
    
+			
    
+		
    
+	
    
+
+
\ No newline at end of file
diff --git a/public/assets/plugins/datatables/extensions/FixedHeader/examples/index.html b/public/assets/plugins/datatables/extensions/FixedHeader/examples/index.html
new file mode 100644
index 00000000..2198d78c
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/FixedHeader/examples/index.html
@@ -0,0 +1,69 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	FixedHeader examples - FixedHeader examples
+
+
+
+	
    
+		
    
+			
    FixedHeader example FixedHeader examples
    
+
+			
    
+				
    At times it can be useful to ensure that column titles will remain always visible on a table, even
+				when a user scrolls down a table. The FixedHeader plug-in for DataTables will float the thead element above the table at all times to help address this issue.
+				The column titles also remain click-able to perform sorting. Key features include:
    
+
+				
      
+					
    • Fix the header to the top of the window
      • 
+					
    • Ability to fix the footer and left / right columns as well
      • 
+					
    • z-Index ordering options
      • 
+				
    
+			
    
+		
    
+	
    
+
+	
    
+		
    
+			
    
+
+			
    
+				
    
+					
    
+						
    Examples
    
+						
+					
    
+				
    
+
+				
    
+					
    Please refer to the DataTables documentation for full
+					information about its API properties and methods.
    
+					Additionally, there are a wide range of extras and
+					plug-ins which extend the capabilities of
+					DataTables.
    
+
+					
    DataTables designed and created by SpryMedia Ltd © 2007-2014
    
+					DataTables is licensed under the MIT license.
    
+				
    
+			
    
+		
    
+	
    
+
+
\ No newline at end of file
diff --git a/public/assets/plugins/datatables/extensions/FixedHeader/examples/simple.html b/public/assets/plugins/datatables/extensions/FixedHeader/examples/simple.html
new file mode 100644
index 00000000..1ad6efa7
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/FixedHeader/examples/simple.html
@@ -0,0 +1,637 @@
+
+
+
+	
+	
+	
+
+	FixedHeader example - Basic initialisation
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
    
+		
    
+			
    FixedHeader example Basic initialisation
    
+
+			
    
+				
    When displaying large amounts of data in a table, it can often be useful for the end user to have
+				the column titles (the thead element as a whole in fact)
+				always visible. This is particularly true if using DataTables with pagination disabled, or the display
+				length is set to a high value.
    
+
+				
    The FixedHeader extension for DataTables will ensure that your column titles will scroll with the
+				page, showing at the top of the table at all times. Try the demo shown below - you might want to try
+				resizing the window for full effect! Note also that the column titles remain clickable to perform
+				sorting on the table.
    
+
+				
    FixedHeader is initialised using the constructor new $.fn.dataTable.FixedHeader(); -
+				shown below.
    
+			
    
+
+			
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+				
+			
    NamePositionOfficeAgeStart dateSalary
    NamePositionOfficeAgeStart dateSalary
    Tiger NixonSystem ArchitectEdinburgh612011/04/25$320,800
    Garrett WintersAccountantTokyo632011/07/25$170,750
    Ashton CoxJunior Technical AuthorSan Francisco662009/01/12$86,000
    Cedric KellySenior Javascript DeveloperEdinburgh222012/03/29$433,060
    Airi SatouAccountantTokyo332008/11/28$162,700
    Brielle WilliamsonIntegration SpecialistNew York612012/12/02$372,000
    Herrod ChandlerSales AssistantSan Francisco592012/08/06$137,500
    Rhona DavidsonIntegration SpecialistTokyo552010/10/14$327,900
    Colleen HurstJavascript DeveloperSan Francisco392009/09/15$205,500
    Sonya FrostSoftware EngineerEdinburgh232008/12/13$103,600
    Jena GainesOffice ManagerLondon302008/12/19$90,560
    Quinn FlynnSupport LeadEdinburgh222013/03/03$342,000
    Charde MarshallRegional DirectorSan Francisco362008/10/16$470,600
    Haley KennedySenior Marketing DesignerLondon432012/12/18$313,500
    Tatyana FitzpatrickRegional DirectorLondon192010/03/17$385,750
    Michael SilvaMarketing DesignerLondon662012/11/27$198,500
    Paul ByrdChief Financial Officer (CFO)New York642010/06/09$725,000
    Gloria LittleSystems AdministratorNew York592009/04/10$237,500
    Bradley GreerSoftware EngineerLondon412012/10/13$132,000
    Dai RiosPersonnel LeadEdinburgh352012/09/26$217,500
    Jenette CaldwellDevelopment LeadNew York302011/09/03$345,000
    Yuri BerryChief Marketing Officer (CMO)New York402009/06/25$675,000
    Caesar VancePre-Sales SupportNew York212011/12/12$106,450
    Doris WilderSales AssistantSidney232010/09/20$85,600
    Angelica RamosChief Executive Officer (CEO)London472009/10/09$1,200,000
    Gavin JoyceDeveloperEdinburgh422010/12/22$92,575
    Jennifer ChangRegional DirectorSingapore282010/11/14$357,650
    Brenden WagnerSoftware EngineerSan Francisco282011/06/07$206,850
    Fiona GreenChief Operating Officer (COO)San Francisco482010/03/11$850,000
    Shou ItouRegional MarketingTokyo202011/08/14$163,000
    Michelle HouseIntegration SpecialistSidney372011/06/02$95,400
    Suki BurksDeveloperLondon532009/10/22$114,500
    Prescott BartlettTechnical AuthorLondon272011/05/07$145,000
    Gavin CortezTeam LeaderSan Francisco222008/10/26$235,500
    Martena MccrayPost-Sales supportEdinburgh462011/03/09$324,050
    Unity ButlerMarketing DesignerSan Francisco472009/12/09$85,675
    Howard HatfieldOffice ManagerSan Francisco512008/12/16$164,500
    Hope FuentesSecretarySan Francisco412010/02/12$109,850
    Vivian HarrellFinancial ControllerSan Francisco622009/02/14$452,500
    Timothy MooneyOffice ManagerLondon372008/12/11$136,200
    Jackson BradshawDirectorNew York652008/09/26$645,750
    Olivia LiangSupport EngineerSingapore642011/02/03$234,500
    Bruno NashSoftware EngineerLondon382011/05/03$163,500
    Sakura YamamotoSupport EngineerTokyo372009/08/19$139,575
    Thor WaltonDeveloperNew York612013/08/11$98,540
    Finn CamachoSupport EngineerSan Francisco472009/07/07$87,500
    Serge BaldwinData CoordinatorSingapore642012/04/09$138,575
    Zenaida FrankSoftware EngineerNew York632010/01/04$125,250
    Zorita SerranoSoftware EngineerSan Francisco562012/06/01$115,000
    Jennifer AcostaJunior Javascript DeveloperEdinburgh432013/02/01$75,650
    Cara StevensSales AssistantNew York462011/12/06$145,600
    Hermione ButlerRegional DirectorLondon472011/03/21$356,250
    Lael GreerSystems AdministratorLondon212009/02/27$103,500
    Jonas AlexanderDeveloperSan Francisco302010/07/14$86,500
    Shad DeckerRegional DirectorEdinburgh512008/11/13$183,000
    Michael BruceJavascript DeveloperSingapore292011/06/27$183,000
    Donna SniderCustomer SupportNew York272011/01/25$112,000
    
+
+			
      
+				
    • Javascript
      • 
+				
    • HTML
      • 
+				
    • CSS
      • 
+				
    • Ajax
      • 
+				
    • Server-side script
      • 
+			
    
+
+			
    
+				
    
+					
    The Javascript shown below is used to initialise the table shown in this
+					example:
    $(document).ready(function() {
+	var table = $('#example').DataTable();
+
+	new $.fn.dataTable.FixedHeader( table );
+} );
+
+					
    In addition to the above code, the following Javascript library files are loaded for use in this
+					example:
    
+
+					
+				
    
+
+				
    
+					
    The HTML shown below is the raw HTML table element, before it has been enhanced by
+					DataTables:
    
+				
    
+
+				
    
+					
    
+						
    This example uses a little bit of additional CSS beyond what is loaded from the library
+						files (below), in order to correctly display the table. The additional CSS used is shown
+						below:
    
+					
    
+
+					
    The following CSS library files are loaded for use in this example to provide the styling of the
+					table:
    
+
+					
+				
    
+
+				
    
+					
    This table loads data by Ajax. The latest data that has been loaded is shown below. This data
+					will update automatically as any additional data is loaded.
    
+				
    
+
+				
    
+					
    The script used to perform the server-side processing for this table is shown below. Please note
+					that this is just an example script using PHP. Server-side processing scripts can be written in any
+					language, using the protocol described in the
+					DataTables documentation.
    
+				
    
+			
    
+		
    
+	
    
+
+	
    
+		
    
+			
    
+
+			
    
+				
    Other examples
    
+
+				
    
+					
    
+						
    Examples
    
+						
+					
    
+				
    
+
+				
    
+					
    Please refer to the DataTables documentation for full
+					information about its API properties and methods.
    
+					Additionally, there are a wide range of extras and
+					plug-ins which extend the capabilities of
+					DataTables.
    
+
+					
    DataTables designed and created by SpryMedia Ltd © 2007-2014
    
+					DataTables is licensed under the MIT license.
    
+				
    
+			
    
+		
    
+	
    
+
+
\ No newline at end of file
diff --git a/public/assets/plugins/datatables/extensions/FixedHeader/examples/top_left_right.html b/public/assets/plugins/datatables/extensions/FixedHeader/examples/top_left_right.html
new file mode 100644
index 00000000..f15faeb5
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/FixedHeader/examples/top_left_right.html
@@ -0,0 +1,236 @@
+
+
+
+	
+	
+	
+
+	FixedHeader example - Header, left and right all fixed
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
    
+		
    
+			
    FixedHeader example Header, left and right all fixed
    
+
+			
    
+				
    FixedHeader provides the ability to fix in place the header, footer, left and right columns of the
+				table. These are controlled by the options:
    
+
+				
      
+					
    • top - default true
      • 
+					
    • bottom - default false
      • 
+					
    • left - default false
      • 
+					
    • right - default false
      • 
+				
    
+
+				
    This example shows top, left and right enabled with index columns on the left and right.
    
+
+				
    Note that in such a situation as this, the FixedColumns extension might be more useful,
+				particularly if you want to use the scrolling options built into DataTables.
    
+			
    
+
+			
    
+
+			
      
+				
    • Javascript
      • 
+				
    • HTML
      • 
+				
    • CSS
      • 
+				
    • Ajax
      • 
+				
    • Server-side script
      • 
+			
    
+
+			
    
+				
    
+					
    The Javascript shown below is used to initialise the table shown in this
+					example:
    $(document).ready(function() {
+	var table = $('#example').DataTable( {
+		"order": [ 1, 'asc' ],
+		"ajax": "../../../examples/ajax/data/objects.txt",
+		"columns": [
+			{ title: '',           data: null, defaultContent: "" },
+			{ title: 'Name',       data: "name" },
+			{ title: 'Position',   data: "position" },
+			{ title: 'Office',     data: "office" },
+			{ title: 'Extn.',      data: "extn" },
+			{ title: 'Start date', data: "start_date" },
+			{ title: 'Salary',     data: "salary" },
+			{ title: '',           data: null, defaultContent: "" }
+		],
+		initComplete: function () {
+			new $.fn.dataTable.FixedHeader( table, {
+				left:   true,
+				right:  true
+			} );
+		}
+	} );
+
+	table.on( 'order.dt search.dt', function () {
+		table.column(0, {search:'applied', order:'applied'}).nodes().each( function (cell, i) {
+			cell.innerHTML = i+1;
+		} );
+
+		table.column(-1, {search:'applied', order:'applied'}).nodes().each( function (cell, i) {
+			cell.innerHTML = i+1;
+		} );
+	} ).draw();
+} );
+
+					
    In addition to the above code, the following Javascript library files are loaded for use in this
+					example:
    
+
+					
+				
    
+
+				
    
+					
    The HTML shown below is the raw HTML table element, before it has been enhanced by
+					DataTables:
    
+				
    
+
+				
    
+					
    
+						
    This example uses a little bit of additional CSS beyond what is loaded from the library
+						files (below), in order to correctly display the table. The additional CSS used is shown
+						below:
    div.dataTables_wrapper {
+		width: 150%;
+	}
+
+	div.FixedHeader_Cloned.fixedLeft tbody td {
+		border-right: 1px solid black;
+	}
+
+	div.FixedHeader_Cloned.fixedRight tbody td {
+		border-left: 1px solid black;
+	}
+					
    
+
+					
    The following CSS library files are loaded for use in this example to provide the styling of the
+					table:
    
+
+					
+				
    
+
+				
    
+					
    This table loads data by Ajax. The latest data that has been loaded is shown below. This data
+					will update automatically as any additional data is loaded.
    
+				
    
+
+				
    
+					
    The script used to perform the server-side processing for this table is shown below. Please note
+					that this is just an example script using PHP. Server-side processing scripts can be written in any
+					language, using the protocol described in the
+					DataTables documentation.
    
+				
    
+			
    
+		
    
+	
    
+
+	
    
+		
    
+			
    
+
+			
    
+				
    Other examples
    
+
+				
    
+					
    
+						
    Examples
    
+						
+					
    
+				
    
+
+				
    
+					
    Please refer to the DataTables documentation for full
+					information about its API properties and methods.
    
+					Additionally, there are a wide range of extras and
+					plug-ins which extend the capabilities of
+					DataTables.
    
+
+					
    DataTables designed and created by SpryMedia Ltd © 2007-2014
    
+					DataTables is licensed under the MIT license.
    
+				
    
+			
    
+		
    
+	
    
+
+
\ No newline at end of file
diff --git a/public/assets/plugins/datatables/extensions/FixedHeader/examples/two_tables.html b/public/assets/plugins/datatables/extensions/FixedHeader/examples/two_tables.html
new file mode 100644
index 00000000..1fbb3dfc
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/FixedHeader/examples/two_tables.html
@@ -0,0 +1,354 @@
+
+
+
+	
+	
+	
+
+	FixedHeader example - Multiple tables
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
    
+		
    
+			
    FixedHeader example Multiple tables
    
+
+			
    
+				
    The following example shows two DataTables enhanced tables both with FixedHeader enabled on them.
+				This is done simply by initialising FixedHeader on each table. This example also shows the footer being
+				fixed in place for the two tables.
    
+			
    
+
+			
+				
+					
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+					
+				
+			
    NamePositionOfficeAgeSalary
    NamePositionOfficeAgeSalary
    Tiger NixonSystem ArchitectEdinburgh61$320,800
    Cedric KellySenior Javascript DeveloperEdinburgh22$433,060
    Sonya FrostSoftware EngineerEdinburgh23$103,600
    Quinn FlynnSupport LeadEdinburgh22$342,000
    Dai RiosPersonnel LeadEdinburgh35$217,500
    Gavin JoyceDeveloperEdinburgh42$92,575
    Martena MccrayPost-Sales supportEdinburgh46$324,050
    Jennifer AcostaJunior Javascript DeveloperEdinburgh43$75,650
    Shad DeckerRegional DirectorEdinburgh51$183,000
    
+
+			
+				
+					
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+					
+				
+			
    NamePositionOfficeAgeSalary
    NamePositionOfficeAgeSalary
    Jena GainesOffice ManagerLondon30$90,560
    Haley KennedySenior Marketing DesignerLondon43$313,500
    Tatyana FitzpatrickRegional DirectorLondon19$385,750
    Michael SilvaMarketing DesignerLondon66$198,500
    Bradley GreerSoftware EngineerLondon41$132,000
    Angelica RamosChief Executive Officer (CEO)London47$1,200,000
    Suki BurksDeveloperLondon53$114,500
    Prescott BartlettTechnical AuthorLondon27$145,000
    Timothy MooneyOffice ManagerLondon37$136,200
    Bruno NashSoftware EngineerLondon38$163,500
    Hermione ButlerRegional DirectorLondon47$356,250
    Lael GreerSystems AdministratorLondon21$103,500
    
+
+			
      
+				
    • Javascript
      • 
+				
    • HTML
      • 
+				
    • CSS
      • 
+				
    • Ajax
      • 
+				
    • Server-side script
      • 
+			
    
+
+			
    
+				
    
+					
    The Javascript shown below is used to initialise the table shown in this
+					example:
    $(document).ready(function() {
+	var t1 = $('table.display').eq(0).DataTable();
+	new $.fn.dataTable.FixedHeader( t1, {
+		bottom: true
+	} );
+
+	var t2 = $('table.display').eq(1).DataTable();
+	new $.fn.dataTable.FixedHeader( t2, {
+		bottom: true
+	} );
+} );
+
+					
    In addition to the above code, the following Javascript library files are loaded for use in this
+					example:
    
+
+					
+				
    
+
+				
    
+					
    The HTML shown below is the raw HTML table element, before it has been enhanced by
+					DataTables:
    
+				
    
+
+				
    
+					
    
+						
    This example uses a little bit of additional CSS beyond what is loaded from the library
+						files (below), in order to correctly display the table. The additional CSS used is shown
+						below:
    
+					
    
+
+					
    The following CSS library files are loaded for use in this example to provide the styling of the
+					table:
    
+
+					
+				
    
+
+				
    
+					
    This table loads data by Ajax. The latest data that has been loaded is shown below. This data
+					will update automatically as any additional data is loaded.
    
+				
    
+
+				
    
+					
    The script used to perform the server-side processing for this table is shown below. Please note
+					that this is just an example script using PHP. Server-side processing scripts can be written in any
+					language, using the protocol described in the
+					DataTables documentation.
    
+				
    
+			
    
+		
    
+	
    
+
+	
    
+		
    
+			
    
+
+			
    
+				
    Other examples
    
+
+				
    
+					
    
+						
    Examples
    
+						
+					
    
+				
    
+
+				
    
+					
    Please refer to the DataTables documentation for full
+					information about its API properties and methods.
    
+					Additionally, there are a wide range of extras and
+					plug-ins which extend the capabilities of
+					DataTables.
    
+
+					
    DataTables designed and created by SpryMedia Ltd © 2007-2014
    
+					DataTables is licensed under the MIT license.
    
+				
    
+			
    
+		
    
+	
    
+
+
\ No newline at end of file
diff --git a/public/assets/plugins/datatables/extensions/FixedHeader/examples/zIndexes.html b/public/assets/plugins/datatables/extensions/FixedHeader/examples/zIndexes.html
new file mode 100644
index 00000000..a3292c4c
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/FixedHeader/examples/zIndexes.html
@@ -0,0 +1,653 @@
+
+
+
+	
+	
+	
+
+	FixedHeader example - z-index order control
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
    
+		
    
+			
    FixedHeader example z-index order control
    
+
+			
    
+				
    When you have two or more columns fixed on a table, there might be occasions when you which to have
+				one column floating on top of another. This example shows how you can do that with the initialisation
+				parameters zTop, zBottom, zLeft and zRight. In this
+				example the left column is set to float on top of the header. The difference is subtle, but can be
+				effective.
    
+
+				
    The default zIndexes are:
    
+
+				
      
+					
    • zTop: 104
      • 
+					
    • zBottom: 103
      • 
+					
    • zLeft: 102
      • 
+					
    • zRight: 101
      • 
+				
    
+
+				
    This example shows the left column being floated on top of the header.
    
+			
    
+
+			
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+				
+			
    NamePositionOfficeAgeStart dateSalary
    NamePositionOfficeAgeStart dateSalary
    Tiger NixonSystem ArchitectEdinburgh612011/04/25$320,800
    Garrett WintersAccountantTokyo632011/07/25$170,750
    Ashton CoxJunior Technical AuthorSan Francisco662009/01/12$86,000
    Cedric KellySenior Javascript DeveloperEdinburgh222012/03/29$433,060
    Airi SatouAccountantTokyo332008/11/28$162,700
    Brielle WilliamsonIntegration SpecialistNew York612012/12/02$372,000
    Herrod ChandlerSales AssistantSan Francisco592012/08/06$137,500
    Rhona DavidsonIntegration SpecialistTokyo552010/10/14$327,900
    Colleen HurstJavascript DeveloperSan Francisco392009/09/15$205,500
    Sonya FrostSoftware EngineerEdinburgh232008/12/13$103,600
    Jena GainesOffice ManagerLondon302008/12/19$90,560
    Quinn FlynnSupport LeadEdinburgh222013/03/03$342,000
    Charde MarshallRegional DirectorSan Francisco362008/10/16$470,600
    Haley KennedySenior Marketing DesignerLondon432012/12/18$313,500
    Tatyana FitzpatrickRegional DirectorLondon192010/03/17$385,750
    Michael SilvaMarketing DesignerLondon662012/11/27$198,500
    Paul ByrdChief Financial Officer (CFO)New York642010/06/09$725,000
    Gloria LittleSystems AdministratorNew York592009/04/10$237,500
    Bradley GreerSoftware EngineerLondon412012/10/13$132,000
    Dai RiosPersonnel LeadEdinburgh352012/09/26$217,500
    Jenette CaldwellDevelopment LeadNew York302011/09/03$345,000
    Yuri BerryChief Marketing Officer (CMO)New York402009/06/25$675,000
    Caesar VancePre-Sales SupportNew York212011/12/12$106,450
    Doris WilderSales AssistantSidney232010/09/20$85,600
    Angelica RamosChief Executive Officer (CEO)London472009/10/09$1,200,000
    Gavin JoyceDeveloperEdinburgh422010/12/22$92,575
    Jennifer ChangRegional DirectorSingapore282010/11/14$357,650
    Brenden WagnerSoftware EngineerSan Francisco282011/06/07$206,850
    Fiona GreenChief Operating Officer (COO)San Francisco482010/03/11$850,000
    Shou ItouRegional MarketingTokyo202011/08/14$163,000
    Michelle HouseIntegration SpecialistSidney372011/06/02$95,400
    Suki BurksDeveloperLondon532009/10/22$114,500
    Prescott BartlettTechnical AuthorLondon272011/05/07$145,000
    Gavin CortezTeam LeaderSan Francisco222008/10/26$235,500
    Martena MccrayPost-Sales supportEdinburgh462011/03/09$324,050
    Unity ButlerMarketing DesignerSan Francisco472009/12/09$85,675
    Howard HatfieldOffice ManagerSan Francisco512008/12/16$164,500
    Hope FuentesSecretarySan Francisco412010/02/12$109,850
    Vivian HarrellFinancial ControllerSan Francisco622009/02/14$452,500
    Timothy MooneyOffice ManagerLondon372008/12/11$136,200
    Jackson BradshawDirectorNew York652008/09/26$645,750
    Olivia LiangSupport EngineerSingapore642011/02/03$234,500
    Bruno NashSoftware EngineerLondon382011/05/03$163,500
    Sakura YamamotoSupport EngineerTokyo372009/08/19$139,575
    Thor WaltonDeveloperNew York612013/08/11$98,540
    Finn CamachoSupport EngineerSan Francisco472009/07/07$87,500
    Serge BaldwinData CoordinatorSingapore642012/04/09$138,575
    Zenaida FrankSoftware EngineerNew York632010/01/04$125,250
    Zorita SerranoSoftware EngineerSan Francisco562012/06/01$115,000
    Jennifer AcostaJunior Javascript DeveloperEdinburgh432013/02/01$75,650
    Cara StevensSales AssistantNew York462011/12/06$145,600
    Hermione ButlerRegional DirectorLondon472011/03/21$356,250
    Lael GreerSystems AdministratorLondon212009/02/27$103,500
    Jonas AlexanderDeveloperSan Francisco302010/07/14$86,500
    Shad DeckerRegional DirectorEdinburgh512008/11/13$183,000
    Michael BruceJavascript DeveloperSingapore292011/06/27$183,000
    Donna SniderCustomer SupportNew York272011/01/25$112,000
    
+
+			
      
+				
    • Javascript
      • 
+				
    • HTML
      • 
+				
    • CSS
      • 
+				
    • Ajax
      • 
+				
    • Server-side script
      • 
+			
    
+
+			
    
+				
    
+					
    The Javascript shown below is used to initialise the table shown in this
+					example:
    $(document).ready(function() {
+	var table = $('#example').DataTable();
+
+	new $.fn.dataTable.FixedHeader( table, {
+		left: true,
+		zLeft: 105
+	} );
+} );
+
+					
    In addition to the above code, the following Javascript library files are loaded for use in this
+					example:
    
+
+					
+				
    
+
+				
    
+					
    The HTML shown below is the raw HTML table element, before it has been enhanced by
+					DataTables:
    
+				
    
+
+				
    
+					
    
+						
    This example uses a little bit of additional CSS beyond what is loaded from the library
+						files (below), in order to correctly display the table. The additional CSS used is shown
+						below:
    div.dataTables_wrapper {
+		width: 1500px;
+	}
+					
    
+
+					
    The following CSS library files are loaded for use in this example to provide the styling of the
+					table:
    
+
+					
+				
    
+
+				
    
+					
    This table loads data by Ajax. The latest data that has been loaded is shown below. This data
+					will update automatically as any additional data is loaded.
    
+				
    
+
+				
    
+					
    The script used to perform the server-side processing for this table is shown below. Please note
+					that this is just an example script using PHP. Server-side processing scripts can be written in any
+					language, using the protocol described in the
+					DataTables documentation.
    
+				
    
+			
    
+		
    
+	
    
+
+	
    
+		
    
+			
    
+
+			
    
+				
    Other examples
    
+
+				
    
+					
    
+						
    Examples
    
+						
+					
    
+				
    
+
+				
    
+					
    Please refer to the DataTables documentation for full
+					information about its API properties and methods.
    
+					Additionally, there are a wide range of extras and
+					plug-ins which extend the capabilities of
+					DataTables.
    
+
+					
    DataTables designed and created by SpryMedia Ltd © 2007-2014
    
+					DataTables is licensed under the MIT license.
    
+				
    
+			
    
+		
    
+	
    
+
+
\ No newline at end of file
diff --git a/public/assets/plugins/datatables/extensions/FixedHeader/js/dataTables.fixedHeader.js b/public/assets/plugins/datatables/extensions/FixedHeader/js/dataTables.fixedHeader.js
new file mode 100644
index 00000000..90df8786
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/FixedHeader/js/dataTables.fixedHeader.js
@@ -0,0 +1,1028 @@
+/*! FixedHeader 2.1.2
+ * ©2010-2014 SpryMedia Ltd - datatables.net/license
+ */
+
+/**
+ * @summary     FixedHeader
+ * @description Fix a table's header or footer, so it is always visible while
+ *              Scrolling
+ * @version     2.1.2
+ * @file        dataTables.fixedHeader.js
+ * @author      SpryMedia Ltd (www.sprymedia.co.uk)
+ * @contact     www.sprymedia.co.uk/contact
+ * @copyright   Copyright 2009-2014 SpryMedia Ltd.
+ *
+ * This source file is free software, available under the following license:
+ *   MIT license - http://datatables.net/license/mit
+ *
+ * This source file is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the license files for details.
+ *
+ * For details please refer to: http://www.datatables.net
+ */
+
+/* Global scope for FixedColumns for backwards compatibility - will be removed
+ * in future. Not documented in 1.1.x.
+ */
+
+/* Global scope for FixedColumns */
+var FixedHeader;
+
+(function(window, document, undefined) {
+
+
+var factory = function( $, DataTable ) {
+"use strict";
+
+/*
+ * Function: FixedHeader
+ * Purpose:  Provide 'fixed' header, footer and columns for a DataTable
+ * Returns:  object:FixedHeader - must be called with 'new'
+ * Inputs:   mixed:mTable - target table
+ *  @param {object} dt DataTables instance or HTML table node. With DataTables
+ *    1.10 this can also be a jQuery collection (with just a single table in its
+ *    result set), a jQuery selector, DataTables API instance or settings
+ *    object.
+ *  @param {object} [oInit] initialisation settings, with the following
+ *    properties (each optional)
+ *    * bool:top -    fix the header (default true)
+ *    * bool:bottom - fix the footer (default false)
+ *    * int:left -    fix the left column(s) (default 0)
+ *    * int:right -   fix the right column(s) (default 0)
+ *    * int:zTop -    fixed header zIndex
+ *    * int:zBottom - fixed footer zIndex
+ *    * int:zLeft -   fixed left zIndex
+ *    * int:zRight -  fixed right zIndex
+ */
+FixedHeader = function ( mTable, oInit ) {
+	/* Sanity check - you just know it will happen */
+	if ( ! this instanceof FixedHeader )
+	{
+		alert( "FixedHeader warning: FixedHeader must be initialised with the 'new' keyword." );
+		return;
+	}
+
+	var that = this;
+	var oSettings = {
+		"aoCache": [],
+		"oSides": {
+			"top": true,
+			"bottom": false,
+			"left": 0,
+			"right": 0
+		},
+		"oZIndexes": {
+			"top": 104,
+			"bottom": 103,
+			"left": 102,
+			"right": 101
+		},
+		"oCloneOnDraw": {
+			"top": false,
+			"bottom": false,
+			"left": true,
+			"right": true
+		},
+		"oMes": {
+			"iTableWidth": 0,
+			"iTableHeight": 0,
+			"iTableLeft": 0,
+			"iTableRight": 0, /* note this is left+width, not actually "right" */
+			"iTableTop": 0,
+			"iTableBottom": 0 /* note this is top+height, not actually "bottom" */
+		},
+		"oOffset": {
+			"top": 0
+		},
+		"nTable": null,
+		"bFooter": false,
+		"bInitComplete": false
+	};
+
+	/*
+	 * Function: fnGetSettings
+	 * Purpose:  Get the settings for this object
+	 * Returns:  object: - settings object
+	 * Inputs:   -
+	 */
+	this.fnGetSettings = function () {
+		return oSettings;
+	};
+
+	/*
+	 * Function: fnUpdate
+	 * Purpose:  Update the positioning and copies of the fixed elements
+	 * Returns:  -
+	 * Inputs:   -
+	 */
+	this.fnUpdate = function () {
+		this._fnUpdateClones();
+		this._fnUpdatePositions();
+	};
+
+	/*
+	 * Function: fnPosition
+	 * Purpose:  Update the positioning of the fixed elements
+	 * Returns:  -
+	 * Inputs:   -
+	 */
+	this.fnPosition = function () {
+		this._fnUpdatePositions();
+	};
+
+
+	var dt = $.fn.dataTable.Api ?
+		new $.fn.dataTable.Api( mTable ).settings()[0] :
+		mTable.fnSettings();
+
+	dt._oPluginFixedHeader = this;
+
+	/* Let's do it */
+	this.fnInit( dt, oInit );
+
+};
+
+
+/*
+ * Variable: FixedHeader
+ * Purpose:  Prototype for FixedHeader
+ * Scope:    global
+ */
+FixedHeader.prototype = {
+	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+	 * Initialisation
+	 */
+
+	/*
+	 * Function: fnInit
+	 * Purpose:  The "constructor"
+	 * Returns:  -
+	 * Inputs:   {as FixedHeader function}
+	 */
+	fnInit: function ( oDtSettings, oInit )
+	{
+		var s = this.fnGetSettings();
+		var that = this;
+
+		/* Record the user definable settings */
+		this.fnInitSettings( s, oInit );
+
+		if ( oDtSettings.oScroll.sX !== "" || oDtSettings.oScroll.sY !== "" )
+		{
+			alert( "FixedHeader 2 is not supported with DataTables' scrolling mode at this time" );
+			return;
+		}
+
+		s.nTable = oDtSettings.nTable;
+		oDtSettings.aoDrawCallback.unshift( {
+			"fn": function () {
+				FixedHeader.fnMeasure();
+				that._fnUpdateClones.call(that);
+				that._fnUpdatePositions.call(that);
+			},
+			"sName": "FixedHeader"
+		} );
+
+		s.bFooter = ($('>tfoot', s.nTable).length > 0) ? true : false;
+
+		/* Add the 'sides' that are fixed */
+		if ( s.oSides.top )
+		{
+			s.aoCache.push( that._fnCloneTable( "fixedHeader", "FixedHeader_Header", that._fnCloneThead ) );
+		}
+		if ( s.oSides.bottom )
+		{
+			s.aoCache.push( that._fnCloneTable( "fixedFooter", "FixedHeader_Footer", that._fnCloneTfoot ) );
+		}
+		if ( s.oSides.left )
+		{
+			s.aoCache.push( that._fnCloneTable( "fixedLeft", "FixedHeader_Left", that._fnCloneTLeft, s.oSides.left ) );
+		}
+		if ( s.oSides.right )
+		{
+			s.aoCache.push( that._fnCloneTable( "fixedRight", "FixedHeader_Right", that._fnCloneTRight, s.oSides.right ) );
+		}
+
+		/* Event listeners for window movement */
+		FixedHeader.afnScroll.push( function () {
+			that._fnUpdatePositions.call(that);
+		} );
+
+		$(window).resize( function () {
+			FixedHeader.fnMeasure();
+			that._fnUpdateClones.call(that);
+			that._fnUpdatePositions.call(that);
+		} );
+
+		$(s.nTable)
+			.on('column-reorder.dt', function () {
+				FixedHeader.fnMeasure();
+				that._fnUpdateClones( true );
+				that._fnUpdatePositions();
+			} )
+			.on('column-visibility.dt', function () {
+				FixedHeader.fnMeasure();
+				that._fnUpdateClones( true );
+				that._fnUpdatePositions();
+			} );
+
+		/* Get things right to start with */
+		FixedHeader.fnMeasure();
+		that._fnUpdateClones();
+		that._fnUpdatePositions();
+
+		s.bInitComplete = true;
+	},
+
+
+	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+	 * Support functions
+	 */
+
+	/*
+	 * Function: fnInitSettings
+	 * Purpose:  Take the user's settings and copy them to our local store
+	 * Returns:  -
+	 * Inputs:   object:s - the local settings object
+	 *           object:oInit - the user's settings object
+	 */
+	fnInitSettings: function ( s, oInit )
+	{
+		if ( oInit !== undefined )
+		{
+			if ( oInit.top !== undefined ) {
+				s.oSides.top = oInit.top;
+			}
+			if ( oInit.bottom !== undefined ) {
+				s.oSides.bottom = oInit.bottom;
+			}
+			if ( typeof oInit.left == 'boolean' ) {
+				s.oSides.left = oInit.left ? 1 : 0;
+			}
+			else if ( oInit.left !== undefined ) {
+				s.oSides.left = oInit.left;
+			}
+			if ( typeof oInit.right == 'boolean' ) {
+				s.oSides.right = oInit.right ? 1 : 0;
+			}
+			else if ( oInit.right !== undefined ) {
+				s.oSides.right = oInit.right;
+			}
+
+			if ( oInit.zTop !== undefined ) {
+				s.oZIndexes.top = oInit.zTop;
+			}
+			if ( oInit.zBottom !== undefined ) {
+				s.oZIndexes.bottom = oInit.zBottom;
+			}
+			if ( oInit.zLeft !== undefined ) {
+				s.oZIndexes.left = oInit.zLeft;
+			}
+			if ( oInit.zRight !== undefined ) {
+				s.oZIndexes.right = oInit.zRight;
+			}
+
+			if ( oInit.offsetTop !== undefined ) {
+				s.oOffset.top = oInit.offsetTop;
+			}
+			if ( oInit.alwaysCloneTop !== undefined ) {
+				s.oCloneOnDraw.top = oInit.alwaysCloneTop;
+			}
+			if ( oInit.alwaysCloneBottom !== undefined ) {
+				s.oCloneOnDraw.bottom = oInit.alwaysCloneBottom;
+			}
+			if ( oInit.alwaysCloneLeft !== undefined ) {
+				s.oCloneOnDraw.left = oInit.alwaysCloneLeft;
+			}
+			if ( oInit.alwaysCloneRight !== undefined ) {
+				s.oCloneOnDraw.right = oInit.alwaysCloneRight;
+			}
+		}
+	},
+
+	/*
+	 * Function: _fnCloneTable
+	 * Purpose:  Clone the table node and do basic initialisation
+	 * Returns:  -
+	 * Inputs:   -
+	 */
+	_fnCloneTable: function ( sType, sClass, fnClone, iCells )
+	{
+		var s = this.fnGetSettings();
+		var nCTable;
+
+		/* We know that the table _MUST_ has a DIV wrapped around it, because this is simply how
+		 * DataTables works. Therefore, we can set this to be relatively position (if it is not
+		 * alreadu absolute, and use this as the base point for the cloned header
+		 */
+		if ( $(s.nTable.parentNode).css('position') != "absolute" )
+		{
+			s.nTable.parentNode.style.position = "relative";
+		}
+
+		/* Just a shallow clone will do - we only want the table node */
+		nCTable = s.nTable.cloneNode( false );
+		nCTable.removeAttribute( 'id' );
+
+		var nDiv = document.createElement( 'div' );
+		nDiv.style.position = "absolute";
+		nDiv.style.top = "0px";
+		nDiv.style.left = "0px";
+		nDiv.className += " FixedHeader_Cloned "+sType+" "+sClass;
+
+		/* Set the zIndexes */
+		if ( sType == "fixedHeader" )
+		{
+			nDiv.style.zIndex = s.oZIndexes.top;
+		}
+		if ( sType == "fixedFooter" )
+		{
+			nDiv.style.zIndex = s.oZIndexes.bottom;
+		}
+		if ( sType == "fixedLeft" )
+		{
+			nDiv.style.zIndex = s.oZIndexes.left;
+		}
+		else if ( sType == "fixedRight" )
+		{
+			nDiv.style.zIndex = s.oZIndexes.right;
+		}
+
+		/* remove margins since we are going to position it absolutely */
+		nCTable.style.margin = "0";
+
+		/* Insert the newly cloned table into the DOM, on top of the "real" header */
+		nDiv.appendChild( nCTable );
+		document.body.appendChild( nDiv );
+
+		return {
+			"nNode": nCTable,
+			"nWrapper": nDiv,
+			"sType": sType,
+			"sPosition": "",
+			"sTop": "",
+			"sLeft": "",
+			"fnClone": fnClone,
+			"iCells": iCells
+		};
+	},
+
+	/*
+	 * Function: _fnMeasure
+	 * Purpose:  Get the current positioning of the table in the DOM
+	 * Returns:  -
+	 * Inputs:   -
+	 */
+	_fnMeasure: function ()
+	{
+		var
+			s = this.fnGetSettings(),
+			m = s.oMes,
+			jqTable = $(s.nTable),
+			oOffset = jqTable.offset(),
+			iParentScrollTop = this._fnSumScroll( s.nTable.parentNode, 'scrollTop' ),
+			iParentScrollLeft = this._fnSumScroll( s.nTable.parentNode, 'scrollLeft' );
+
+		m.iTableWidth = jqTable.outerWidth();
+		m.iTableHeight = jqTable.outerHeight();
+		m.iTableLeft = oOffset.left + s.nTable.parentNode.scrollLeft;
+		m.iTableTop = oOffset.top + iParentScrollTop;
+		m.iTableRight = m.iTableLeft + m.iTableWidth;
+		m.iTableRight = FixedHeader.oDoc.iWidth - m.iTableLeft - m.iTableWidth;
+		m.iTableBottom = FixedHeader.oDoc.iHeight - m.iTableTop - m.iTableHeight;
+	},
+
+	/*
+	 * Function: _fnSumScroll
+	 * Purpose:  Sum node parameters all the way to the top
+	 * Returns:  int: sum
+	 * Inputs:   node:n - node to consider
+	 *           string:side - scrollTop or scrollLeft
+	 */
+	_fnSumScroll: function ( n, side )
+	{
+		var i = n[side];
+		while ( n = n.parentNode )
+		{
+			if ( n.nodeName == 'HTML' || n.nodeName == 'BODY' )
+			{
+				break;
+			}
+			i = n[side];
+		}
+		return i;
+	},
+
+	/*
+	 * Function: _fnUpdatePositions
+	 * Purpose:  Loop over the fixed elements for this table and update their positions
+	 * Returns:  -
+	 * Inputs:   -
+	 */
+	_fnUpdatePositions: function ()
+	{
+		var s = this.fnGetSettings();
+		this._fnMeasure();
+
+		for ( var i=0, iLen=s.aoCache.length ; i oWin.iScrollTop + s.oOffset.top )
+		{
+			/* Above the table */
+			this._fnUpdateCache( oCache, 'sPosition', "absolute", 'position', nTable.style );
+			this._fnUpdateCache( oCache, 'sTop', oMes.iTableTop+"px", 'top', nTable.style );
+			this._fnUpdateCache( oCache, 'sLeft', oMes.iTableLeft+"px", 'left', nTable.style );
+		}
+		else if ( oWin.iScrollTop + s.oOffset.top > oMes.iTableTop+iTbodyHeight )
+		{
+			/* At the bottom of the table */
+			this._fnUpdateCache( oCache, 'sPosition', "absolute", 'position', nTable.style );
+			this._fnUpdateCache( oCache, 'sTop', (oMes.iTableTop+iTbodyHeight)+"px", 'top', nTable.style );
+			this._fnUpdateCache( oCache, 'sLeft', oMes.iTableLeft+"px", 'left', nTable.style );
+		}
+		else
+		{
+			/* In the middle of the table */
+			this._fnUpdateCache( oCache, 'sPosition', 'fixed', 'position', nTable.style );
+			this._fnUpdateCache( oCache, 'sTop', s.oOffset.top+"px", 'top', nTable.style );
+			this._fnUpdateCache( oCache, 'sLeft', (oMes.iTableLeft-oWin.iScrollLeft)+"px", 'left', nTable.style );
+		}
+	},
+
+	/*
+	 * Function: _fnUpdateCache
+	 * Purpose:  Check the cache and update cache and value if needed
+	 * Returns:  -
+	 * Inputs:   object:oCache - local cache object
+	 *           string:sCache - cache property
+	 *           string:sSet - value to set
+	 *           string:sProperty - object property to set
+	 *           object:oObj - object to update
+	 */
+	_fnUpdateCache: function ( oCache, sCache, sSet, sProperty, oObj )
+	{
+		if ( oCache[sCache] != sSet )
+		{
+			oObj[sProperty] = sSet;
+			oCache[sCache] = sSet;
+		}
+	},
+
+
+
+	/**
+	 * Copy the classes of all child nodes from one element to another. This implies
+	 * that the two have identical structure - no error checking is performed to that
+	 * fact.
+	 *  @param {element} source Node to copy classes from
+	 *  @param {element} dest Node to copy classes too
+	 */
+	_fnClassUpdate: function ( source, dest )
+	{
+		var that = this;
+
+		if ( source.nodeName.toUpperCase() === "TR" || source.nodeName.toUpperCase() === "TH" ||
+			 source.nodeName.toUpperCase() === "TD" || source.nodeName.toUpperCase() === "SPAN" )
+		{
+			dest.className = source.className;
+		}
+
+		$(source).children().each( function (i) {
+			that._fnClassUpdate( $(source).children()[i], $(dest).children()[i] );
+		} );
+	},
+
+
+	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+	 * Cloning functions
+	 */
+
+	/*
+	 * Function: _fnCloneThead
+	 * Purpose:  Clone the thead element
+	 * Returns:  -
+	 * Inputs:   object:oCache - the cached values for this fixed element
+	 */
+	_fnCloneThead: function ( oCache )
+	{
+		var s = this.fnGetSettings();
+		var nTable = oCache.nNode;
+
+		if ( s.bInitComplete && !s.oCloneOnDraw.top )
+		{
+			this._fnClassUpdate( $('thead', s.nTable)[0], $('thead', nTable)[0] );
+			return;
+		}
+
+		/* Set the wrapper width to match that of the cloned table */
+		var iDtWidth = $(s.nTable).outerWidth();
+		oCache.nWrapper.style.width = iDtWidth+"px";
+		nTable.style.width = iDtWidth+"px";
+
+		/* Remove any children the cloned table has */
+		while ( nTable.childNodes.length > 0 )
+		{
+			$('thead th', nTable).unbind( 'click' );
+			nTable.removeChild( nTable.childNodes[0] );
+		}
+
+		/* Clone the DataTables header */
+		var nThead = $('thead', s.nTable).clone(true)[0];
+		nTable.appendChild( nThead );
+
+		/* Copy the widths across - apparently a clone isn't good enough for this */
+		var a = [];
+		var b = [];
+
+		$("thead>tr th", s.nTable).each( function (i) {
+			a.push( $(this).width() );
+		} );
+
+		$("thead>tr td", s.nTable).each( function (i) {
+			b.push( $(this).width() );
+		} );
+
+		$("thead>tr th", s.nTable).each( function (i) {
+			$("thead>tr th:eq("+i+")", nTable).width( a[i] );
+			$(this).width( a[i] );
+		} );
+
+		$("thead>tr td", s.nTable).each( function (i) {
+			$("thead>tr td:eq("+i+")", nTable).width( b[i] );
+			$(this).width( b[i] );
+		} );
+
+		// Stop DataTables 1.9 from putting a focus ring on the headers when
+		// clicked to sort
+		$('th.sorting, th.sorting_desc, th.sorting_asc', nTable).bind( 'click', function () {
+			this.blur();
+		} );
+	},
+
+	/*
+	 * Function: _fnCloneTfoot
+	 * Purpose:  Clone the tfoot element
+	 * Returns:  -
+	 * Inputs:   object:oCache - the cached values for this fixed element
+	 */
+	_fnCloneTfoot: function ( oCache )
+	{
+		var s = this.fnGetSettings();
+		var nTable = oCache.nNode;
+
+		/* Set the wrapper width to match that of the cloned table */
+		oCache.nWrapper.style.width = $(s.nTable).outerWidth()+"px";
+
+		/* Remove any children the cloned table has */
+		while ( nTable.childNodes.length > 0 )
+		{
+			nTable.removeChild( nTable.childNodes[0] );
+		}
+
+		/* Clone the DataTables footer */
+		var nTfoot = $('tfoot', s.nTable).clone(true)[0];
+		nTable.appendChild( nTfoot );
+
+		/* Copy the widths across - apparently a clone isn't good enough for this */
+		$("tfoot:eq(0)>tr th", s.nTable).each( function (i) {
+			$("tfoot:eq(0)>tr th:eq("+i+")", nTable).width( $(this).width() );
+		} );
+
+		$("tfoot:eq(0)>tr td", s.nTable).each( function (i) {
+			$("tfoot:eq(0)>tr td:eq("+i+")", nTable).width( $(this).width() );
+		} );
+	},
+
+	/*
+	 * Function: _fnCloneTLeft
+	 * Purpose:  Clone the left column(s)
+	 * Returns:  -
+	 * Inputs:   object:oCache - the cached values for this fixed element
+	 */
+	_fnCloneTLeft: function ( oCache )
+	{
+		var s = this.fnGetSettings();
+		var nTable = oCache.nNode;
+		var nBody = $('tbody', s.nTable)[0];
+
+		/* Remove any children the cloned table has */
+		while ( nTable.childNodes.length > 0 )
+		{
+			nTable.removeChild( nTable.childNodes[0] );
+		}
+
+		/* Is this the most efficient way to do this - it looks horrible... */
+		nTable.appendChild( $("thead", s.nTable).clone(true)[0] );
+		nTable.appendChild( $("tbody", s.nTable).clone(true)[0] );
+		if ( s.bFooter )
+		{
+			nTable.appendChild( $("tfoot", s.nTable).clone(true)[0] );
+		}
+
+		/* Remove unneeded cells */
+		var sSelector = 'gt(' + (oCache.iCells - 1) + ')';
+		$('thead tr', nTable).each( function (k) {
+			$('th:' + sSelector, this).remove();
+		} );
+
+		$('tfoot tr', nTable).each( function (k) {
+			$('th:' + sSelector, this).remove();
+		} );
+
+		$('tbody tr', nTable).each( function (k) {
+			$('td:' + sSelector, this).remove();
+		} );
+
+		this.fnEqualiseHeights( 'thead', nBody.parentNode, nTable );
+		this.fnEqualiseHeights( 'tbody', nBody.parentNode, nTable );
+		this.fnEqualiseHeights( 'tfoot', nBody.parentNode, nTable );
+
+		var iWidth = 0;
+		for (var i = 0; i < oCache.iCells; i++) {
+			iWidth += $('thead tr th:eq(' + i + ')', s.nTable).outerWidth();
+		}
+		nTable.style.width = iWidth+"px";
+		oCache.nWrapper.style.width = iWidth+"px";
+	},
+
+	/*
+	 * Function: _fnCloneTRight
+	 * Purpose:  Clone the right most column(s)
+	 * Returns:  -
+	 * Inputs:   object:oCache - the cached values for this fixed element
+	 */
+	_fnCloneTRight: function ( oCache )
+	{
+		var s = this.fnGetSettings();
+		var nBody = $('tbody', s.nTable)[0];
+		var nTable = oCache.nNode;
+		var iCols = $('tbody tr:eq(0) td', s.nTable).length;
+
+		/* Remove any children the cloned table has */
+		while ( nTable.childNodes.length > 0 )
+		{
+			nTable.removeChild( nTable.childNodes[0] );
+		}
+
+		/* Is this the most efficient way to do this - it looks horrible... */
+		nTable.appendChild( $("thead", s.nTable).clone(true)[0] );
+		nTable.appendChild( $("tbody", s.nTable).clone(true)[0] );
+		if ( s.bFooter )
+		{
+			nTable.appendChild( $("tfoot", s.nTable).clone(true)[0] );
+		}
+		$('thead tr th:lt('+(iCols-oCache.iCells)+')', nTable).remove();
+		$('tfoot tr th:lt('+(iCols-oCache.iCells)+')', nTable).remove();
+
+		/* Remove unneeded cells */
+		$('tbody tr', nTable).each( function (k) {
+			$('td:lt('+(iCols-oCache.iCells)+')', this).remove();
+		} );
+
+		this.fnEqualiseHeights( 'thead', nBody.parentNode, nTable );
+		this.fnEqualiseHeights( 'tbody', nBody.parentNode, nTable );
+		this.fnEqualiseHeights( 'tfoot', nBody.parentNode, nTable );
+
+		var iWidth = 0;
+		for (var i = 0; i < oCache.iCells; i++) {
+			iWidth += $('thead tr th:eq('+(iCols-1-i)+')', s.nTable).outerWidth();
+		}
+		nTable.style.width = iWidth+"px";
+		oCache.nWrapper.style.width = iWidth+"px";
+	},
+
+
+	/**
+	 * Equalise the heights of the rows in a given table node in a cross browser way. Note that this
+	 * is more or less lifted as is from FixedColumns
+	 *  @method  fnEqualiseHeights
+	 *  @returns void
+	 *  @param   {string} parent Node type - thead, tbody or tfoot
+	 *  @param   {element} original Original node to take the heights from
+	 *  @param   {element} clone Copy the heights to
+	 *  @private
+	 */
+	"fnEqualiseHeights": function ( parent, original, clone )
+	{
+		var that = this;
+		var originals = $(parent +' tr', original);
+		var height;
+
+		$(parent+' tr', clone).each( function (k) {
+			height = originals.eq( k ).css('height');
+
+			// This is nasty :-(. IE has a sub-pixel error even when setting
+			// the height below (the Firefox fix) which causes the fixed column
+			// to go out of alignment. Need to add a pixel before the assignment
+			// Can this be feature detected? Not sure how...
+			if ( navigator.appName == 'Microsoft Internet Explorer' ) {
+				height = parseInt( height, 10 ) + 1;
+			}
+
+			$(this).css( 'height', height );
+
+			// For Firefox to work, we need to also set the height of the
+			// original row, to the value that we read from it! Otherwise there
+			// is a sub-pixel rounding error
+			originals.eq( k ).css( 'height', height );
+		} );
+	}
+};
+
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Static properties and methods
+ *   We use these for speed! This information is common to all instances of FixedHeader, so no
+ * point if having them calculated and stored for each different instance.
+ */
+
+/*
+ * Variable: oWin
+ * Purpose:  Store information about the window positioning
+ * Scope:    FixedHeader
+ */
+FixedHeader.oWin = {
+	"iScrollTop": 0,
+	"iScrollRight": 0,
+	"iScrollBottom": 0,
+	"iScrollLeft": 0,
+	"iHeight": 0,
+	"iWidth": 0
+};
+
+/*
+ * Variable: oDoc
+ * Purpose:  Store information about the document size
+ * Scope:    FixedHeader
+ */
+FixedHeader.oDoc = {
+	"iHeight": 0,
+	"iWidth": 0
+};
+
+/*
+ * Variable: afnScroll
+ * Purpose:  Array of functions that are to be used for the scrolling components
+ * Scope:    FixedHeader
+ */
+FixedHeader.afnScroll = [];
+
+/*
+ * Function: fnMeasure
+ * Purpose:  Update the measurements for the window and document
+ * Returns:  -
+ * Inputs:   -
+ */
+FixedHeader.fnMeasure = function ()
+{
+	var
+		jqWin = $(window),
+		jqDoc = $(document),
+		oWin = FixedHeader.oWin,
+		oDoc = FixedHeader.oDoc;
+
+	oDoc.iHeight = jqDoc.height();
+	oDoc.iWidth = jqDoc.width();
+
+	oWin.iHeight = jqWin.height();
+	oWin.iWidth = jqWin.width();
+	oWin.iScrollTop = jqWin.scrollTop();
+	oWin.iScrollLeft = jqWin.scrollLeft();
+	oWin.iScrollRight = oDoc.iWidth - oWin.iScrollLeft - oWin.iWidth;
+	oWin.iScrollBottom = oDoc.iHeight - oWin.iScrollTop - oWin.iHeight;
+};
+
+
+FixedHeader.version = "2.1.2";
+
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Global processing
+ */
+
+/*
+ * Just one 'scroll' event handler in FixedHeader, which calls the required components. This is
+ * done as an optimisation, to reduce calculation and proagation time
+ */
+$(window).scroll( function () {
+	FixedHeader.fnMeasure();
+
+	for ( var i=0, iLen=FixedHeader.afnScroll.length ; itfoot",c.nTable).length?!0:!1,c.oSides.top&&c.aoCache.push(d._fnCloneTable("fixedHeader","FixedHeader_Header",d._fnCloneThead)),c.oSides.bottom&&c.aoCache.push(d._fnCloneTable("fixedFooter","FixedHeader_Footer",d._fnCloneTfoot)),c.oSides.left&&c.aoCache.push(d._fnCloneTable("fixedLeft","FixedHeader_Left",d._fnCloneTLeft,c.oSides.left)),
+c.oSides.right&&c.aoCache.push(d._fnCloneTable("fixedRight","FixedHeader_Right",d._fnCloneTRight,c.oSides.right)),FixedHeader.afnScroll.push(function(){d._fnUpdatePositions.call(d)}),e(j).resize(function(){FixedHeader.fnMeasure();d._fnUpdateClones.call(d);d._fnUpdatePositions.call(d)}),e(c.nTable).on("column-reorder.dt",function(){FixedHeader.fnMeasure();d._fnUpdateClones(!0);d._fnUpdatePositions()}).on("column-visibility.dt",function(){FixedHeader.fnMeasure();d._fnUpdateClones(!0);d._fnUpdatePositions()}),
+FixedHeader.fnMeasure(),d._fnUpdateClones(),d._fnUpdatePositions(),c.bInitComplete=!0)},fnInitSettings:function(a,b){if(b!==h&&(b.top!==h&&(a.oSides.top=b.top),b.bottom!==h&&(a.oSides.bottom=b.bottom),"boolean"==typeof b.left?a.oSides.left=b.left?1:0:b.left!==h&&(a.oSides.left=b.left),"boolean"==typeof b.right?a.oSides.right=b.right?1:0:b.right!==h&&(a.oSides.right=b.right),b.zTop!==h&&(a.oZIndexes.top=b.zTop),b.zBottom!==h&&(a.oZIndexes.bottom=b.zBottom),b.zLeft!==h&&(a.oZIndexes.left=b.zLeft),b.zRight!==
+h&&(a.oZIndexes.right=b.zRight),b.offsetTop!==h&&(a.oOffset.top=b.offsetTop),b.alwaysCloneTop!==h&&(a.oCloneOnDraw.top=b.alwaysCloneTop),b.alwaysCloneBottom!==h&&(a.oCloneOnDraw.bottom=b.alwaysCloneBottom),b.alwaysCloneLeft!==h&&(a.oCloneOnDraw.left=b.alwaysCloneLeft),b.alwaysCloneRight!==h))a.oCloneOnDraw.right=b.alwaysCloneRight},_fnCloneTable:function(a,b,c,d){var f=this.fnGetSettings(),g;"absolute"!=e(f.nTable.parentNode).css("position")&&(f.nTable.parentNode.style.position="relative");g=f.nTable.cloneNode(!1);
+g.removeAttribute("id");var i=k.createElement("div");i.style.position="absolute";i.style.top="0px";i.style.left="0px";i.className+=" FixedHeader_Cloned "+a+" "+b;"fixedHeader"==a&&(i.style.zIndex=f.oZIndexes.top);"fixedFooter"==a&&(i.style.zIndex=f.oZIndexes.bottom);"fixedLeft"==a?i.style.zIndex=f.oZIndexes.left:"fixedRight"==a&&(i.style.zIndex=f.oZIndexes.right);g.style.margin="0";i.appendChild(g);k.body.appendChild(i);return{nNode:g,nWrapper:i,sType:a,sPosition:"",sTop:"",sLeft:"",fnClone:c,iCells:d}},
+_fnMeasure:function(){var a=this.fnGetSettings(),b=a.oMes,c=e(a.nTable),d=c.offset(),f=this._fnSumScroll(a.nTable.parentNode,"scrollTop");this._fnSumScroll(a.nTable.parentNode,"scrollLeft");b.iTableWidth=c.outerWidth();b.iTableHeight=c.outerHeight();b.iTableLeft=d.left+a.nTable.parentNode.scrollLeft;b.iTableTop=d.top+f;b.iTableRight=b.iTableLeft+b.iTableWidth;b.iTableRight=FixedHeader.oDoc.iWidth-b.iTableLeft-b.iTableWidth;b.iTableBottom=FixedHeader.oDoc.iHeight-b.iTableTop-b.iTableHeight},_fnSumScroll:function(a,
+b){for(var c=a[b];(a=a.parentNode)&&!("HTML"==a.nodeName||"BODY"==a.nodeName);)c=a[b];return c},_fnUpdatePositions:function(){var a=this.fnGetSettings();this._fnMeasure();for(var b=0,c=a.aoCache.length;bd.iScrollTop+b.oOffset.top?(this._fnUpdateCache(a,"sPosition","absolute","position",e.style),this._fnUpdateCache(a,"sTop",c.iTableTop+"px","top",e.style),this._fnUpdateCache(a,"sLeft",c.iTableLeft+"px","left",e.style)):d.iScrollTop+b.oOffset.top>c.iTableTop+
+g?(this._fnUpdateCache(a,"sPosition","absolute","position",e.style),this._fnUpdateCache(a,"sTop",c.iTableTop+g+"px","top",e.style),this._fnUpdateCache(a,"sLeft",c.iTableLeft+"px","left",e.style)):(this._fnUpdateCache(a,"sPosition","fixed","position",e.style),this._fnUpdateCache(a,"sTop",b.oOffset.top+"px","top",e.style),this._fnUpdateCache(a,"sLeft",c.iTableLeft-d.iScrollLeft+"px","left",e.style))},_fnUpdateCache:function(a,b,c,d,e){a[b]!=c&&(e[d]=c,a[b]=c)},_fnClassUpdate:function(a,b){var c=this;
+if("TR"===a.nodeName.toUpperCase()||"TH"===a.nodeName.toUpperCase()||"TD"===a.nodeName.toUpperCase()||"SPAN"===a.nodeName.toUpperCase())b.className=a.className;e(a).children().each(function(d){c._fnClassUpdate(e(a).children()[d],e(b).children()[d])})},_fnCloneThead:function(a){var b=this.fnGetSettings(),c=a.nNode;if(b.bInitComplete&&!b.oCloneOnDraw.top)this._fnClassUpdate(e("thead",b.nTable)[0],e("thead",c)[0]);else{var d=e(b.nTable).outerWidth();a.nWrapper.style.width=d+"px";for(c.style.width=d+
+"px";0tr th",b.nTable).each(function(){f.push(e(this).width())});e("thead>tr td",b.nTable).each(function(){g.push(e(this).width())});e("thead>tr th",b.nTable).each(function(a){e("thead>tr th:eq("+a+")",c).width(f[a]);e(this).width(f[a])});e("thead>tr td",b.nTable).each(function(a){e("thead>tr td:eq("+a+")",c).width(g[a]);e(this).width(g[a])});
+e("th.sorting, th.sorting_desc, th.sorting_asc",c).bind("click",function(){this.blur()})}},_fnCloneTfoot:function(a){var b=this.fnGetSettings(),c=a.nNode;for(a.nWrapper.style.width=e(b.nTable).outerWidth()+"px";0tr th",b.nTable).each(function(a){e("tfoot:eq(0)>tr th:eq("+a+")",c).width(e(this).width())});e("tfoot:eq(0)>tr td",b.nTable).each(function(a){e("tfoot:eq(0)>tr td:eq("+
+a+")",c).width(e(this).width())})},_fnCloneTLeft:function(a){for(var b=this.fnGetSettings(),c=a.nNode,d=e("tbody",b.nTable)[0];0
+
+
+	
+	
+	
+
+	KeyTable example - Events
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
    
+		
    
+			
    KeyTable example Events
    
+
+			
    
+				
    KeyTable provides the ability to listen for events such as focus, blur,
+				esc (the escape key) and 'return' (the return key) can be assigned event handling
+				functions through KeyTable's the API. This gives you the ability to take an action on a cell.
    
+
+				
    The example shown below has a few cells (selected at random, but near the top) with blur and focus
+				events assigned to them. You can also see the navigation around the table using arrow keys.
    
+			
    
+
+			
    
+				Event information:
    
+			
    
+
+			
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+				
+			
    NamePositionOfficeAgeStart dateSalary
    NamePositionOfficeAgeStart dateSalary
    Tiger NixonSystem ArchitectEdinburgh612011/04/25$320,800
    Garrett WintersAccountantTokyo632011/07/25$170,750
    Ashton CoxJunior Technical AuthorSan Francisco662009/01/12$86,000
    Cedric KellySenior Javascript DeveloperEdinburgh222012/03/29$433,060
    Airi SatouAccountantTokyo332008/11/28$162,700
    Brielle WilliamsonIntegration SpecialistNew York612012/12/02$372,000
    Herrod ChandlerSales AssistantSan Francisco592012/08/06$137,500
    Rhona DavidsonIntegration SpecialistTokyo552010/10/14$327,900
    Colleen HurstJavascript DeveloperSan Francisco392009/09/15$205,500
    Sonya FrostSoftware EngineerEdinburgh232008/12/13$103,600
    Jena GainesOffice ManagerLondon302008/12/19$90,560
    Quinn FlynnSupport LeadEdinburgh222013/03/03$342,000
    Charde MarshallRegional DirectorSan Francisco362008/10/16$470,600
    Haley KennedySenior Marketing DesignerLondon432012/12/18$313,500
    Tatyana FitzpatrickRegional DirectorLondon192010/03/17$385,750
    Michael SilvaMarketing DesignerLondon662012/11/27$198,500
    Paul ByrdChief Financial Officer (CFO)New York642010/06/09$725,000
    Gloria LittleSystems AdministratorNew York592009/04/10$237,500
    Bradley GreerSoftware EngineerLondon412012/10/13$132,000
    Dai RiosPersonnel LeadEdinburgh352012/09/26$217,500
    Jenette CaldwellDevelopment LeadNew York302011/09/03$345,000
    Yuri BerryChief Marketing Officer (CMO)New York402009/06/25$675,000
    Caesar VancePre-Sales SupportNew York212011/12/12$106,450
    Doris WilderSales AssistantSidney232010/09/20$85,600
    Angelica RamosChief Executive Officer (CEO)London472009/10/09$1,200,000
    Gavin JoyceDeveloperEdinburgh422010/12/22$92,575
    Jennifer ChangRegional DirectorSingapore282010/11/14$357,650
    Brenden WagnerSoftware EngineerSan Francisco282011/06/07$206,850
    Fiona GreenChief Operating Officer (COO)San Francisco482010/03/11$850,000
    Shou ItouRegional MarketingTokyo202011/08/14$163,000
    Michelle HouseIntegration SpecialistSidney372011/06/02$95,400
    Suki BurksDeveloperLondon532009/10/22$114,500
    Prescott BartlettTechnical AuthorLondon272011/05/07$145,000
    Gavin CortezTeam LeaderSan Francisco222008/10/26$235,500
    Martena MccrayPost-Sales supportEdinburgh462011/03/09$324,050
    Unity ButlerMarketing DesignerSan Francisco472009/12/09$85,675
    Howard HatfieldOffice ManagerSan Francisco512008/12/16$164,500
    Hope FuentesSecretarySan Francisco412010/02/12$109,850
    Vivian HarrellFinancial ControllerSan Francisco622009/02/14$452,500
    Timothy MooneyOffice ManagerLondon372008/12/11$136,200
    Jackson BradshawDirectorNew York652008/09/26$645,750
    Olivia LiangSupport EngineerSingapore642011/02/03$234,500
    Bruno NashSoftware EngineerLondon382011/05/03$163,500
    Sakura YamamotoSupport EngineerTokyo372009/08/19$139,575
    Thor WaltonDeveloperNew York612013/08/11$98,540
    Finn CamachoSupport EngineerSan Francisco472009/07/07$87,500
    Serge BaldwinData CoordinatorSingapore642012/04/09$138,575
    Zenaida FrankSoftware EngineerNew York632010/01/04$125,250
    Zorita SerranoSoftware EngineerSan Francisco562012/06/01$115,000
    Jennifer AcostaJunior Javascript DeveloperEdinburgh432013/02/01$75,650
    Cara StevensSales AssistantNew York462011/12/06$145,600
    Hermione ButlerRegional DirectorLondon472011/03/21$356,250
    Lael GreerSystems AdministratorLondon212009/02/27$103,500
    Jonas AlexanderDeveloperSan Francisco302010/07/14$86,500
    Shad DeckerRegional DirectorEdinburgh512008/11/13$183,000
    Michael BruceJavascript DeveloperSingapore292011/06/27$183,000
    Donna SniderCustomer SupportNew York272011/01/25$112,000
    
+
+			
      
+				
    • Javascript
      • 
+				
    • HTML
      • 
+				
    • CSS
      • 
+				
    • Ajax
      • 
+				
    • Server-side script
      • 
+			
    
+
+			
    
+				
    
+					
    The Javascript shown below is used to initialise the table shown in this
+					example:
    function eventMsg ( msg ) {
+	var n = document.getElementById('info');
+	n.innerHTML += msg+"<br>";
+	n.scrollTop = n.scrollHeight;
+}
+
+$(document).ready(function() {
+	var table = $('#example').DataTable();
+	var keys = new $.fn.dataTable.KeyTable( table );
+
+	/* Focus handler for all cells in last column */
+	keys.event.focus( 4, null, function( node, x, y ) {
+		eventMsg( "Cell "+x+","+y+" focused ('live' event - column)" );
+	} );
+	
+	/* Focus handler for all cells in 8th row */
+	keys.event.focus( null, 7, function( node, x, y ) {
+		eventMsg( "Cell "+x+","+y+" focused ('live' event - row)" );
+	} );
+	
+	/* Focus using coords. */
+	keys.event.focus( 1, 0, function( node ) {
+		keys.event.remove.focus( node );
+		eventMsg( "Cell 1,0 focus - this event has now been removed" );
+	} );
+	
+	keys.event.focus( 1, 3, function() {
+		eventMsg( "Cell 1,3 focus" );
+	} );
+	
+	/* focus with a node */
+	keys.event.focus( $('#example tbody tr:eq(2) td:eq(0)')[0], function() {
+		eventMsg( "Cell 0,2 focus" );
+	} );
+	
+	/* Blur using a node */
+	keys.event.blur( $('#example tbody tr:eq(1) td:eq(2)')[0], function() {
+		eventMsg( "Cell 1,2 blur" );
+	} );
+	
+	/* Blur using coords */
+	keys.event.blur( 2, 4, function() {
+		eventMsg( "Cell 2,4 blur" );
+	} );
+	
+	/* Action */
+	keys.event.action( 2, 2, function( node ) {
+		eventMsg( "Cell 2,2 action" );
+		if ( node.style.fontWeight == "" || node.style.fontWeight == "normal" ) {
+			node.style.fontWeight = "bold";
+		}
+		else {
+			node.style.fontWeight = "normal";
+		}
+	} );
+	
+	keys.event.action( 2, 5, function( node ) {
+		eventMsg( "Cell 2,5 action" );
+		if ( node.style.fontStyle == "" ) {
+			node.style.fontStyle = "italic";
+		}
+		else {
+			node.style.fontStyle = "";
+		}
+	} );
+} );
+
+					
    In addition to the above code, the following Javascript library files are loaded for use in this
+					example:
    
+
+					
+				
    
+
+				
    
+					
    The HTML shown below is the raw HTML table element, before it has been enhanced by
+					DataTables:
    
+				
    
+
+				
    
+					
    
+						
    This example uses a little bit of additional CSS beyond what is loaded from the library
+						files (below), in order to correctly display the table. The additional CSS used is shown
+						below:
    
+					
    
+
+					
    The following CSS library files are loaded for use in this example to provide the styling of the
+					table:
    
+
+					
+				
    
+
+				
    
+					
    This table loads data by Ajax. The latest data that has been loaded is shown below. This data
+					will update automatically as any additional data is loaded.
    
+				
    
+
+				
    
+					
    The script used to perform the server-side processing for this table is shown below. Please note
+					that this is just an example script using PHP. Server-side processing scripts can be written in any
+					language, using the protocol described in the
+					DataTables documentation.
    
+				
    
+			
    
+		
    
+	
    
+
+	
    
+		
    
+			
    
+
+			
    
+				
    Other examples
    
+
+				
    
+					
    
+						
    Examples
    
+						
+					
    
+				
    
+
+				
    
+					
    Please refer to the DataTables documentation for full
+					information about its API properties and methods.
    
+					Additionally, there are a wide range of extras and
+					plug-ins which extend the capabilities of
+					DataTables.
    
+
+					
    DataTables designed and created by SpryMedia Ltd © 2007-2014
    
+					DataTables is licensed under the MIT license.
    
+				
    
+			
    
+		
    
+	
    
+
+
\ No newline at end of file
diff --git a/public/assets/plugins/datatables/extensions/KeyTable/examples/html.html b/public/assets/plugins/datatables/extensions/KeyTable/examples/html.html
new file mode 100644
index 00000000..a0a0e108
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/KeyTable/examples/html.html
@@ -0,0 +1,627 @@
+
+
+
+	
+	
+	
+
+	KeyTable example - Plain HTML table
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
    
+		
    
+			
    KeyTable example Plain HTML table
    
+
+			
    
+				
    As well as being usable with DataTables, KeyTable can also be used with a plain HTML table. Please
+				note that this ability is deprecated and will be removed in KeyTable 1.3.
    
+
+				
    This example shows KeyTable being initialised without any parameter, which instructs it to search
+				for any table with the class KeyTable which will be used.
    
+			
    
+
+			
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+				
+			
    NamePositionOfficeAgeStart dateSalary
    NamePositionOfficeAgeStart dateSalary
    Tiger NixonSystem ArchitectEdinburgh612011/04/25$320,800
    Garrett WintersAccountantTokyo632011/07/25$170,750
    Ashton CoxJunior Technical AuthorSan Francisco662009/01/12$86,000
    Cedric KellySenior Javascript DeveloperEdinburgh222012/03/29$433,060
    Airi SatouAccountantTokyo332008/11/28$162,700
    Brielle WilliamsonIntegration SpecialistNew York612012/12/02$372,000
    Herrod ChandlerSales AssistantSan Francisco592012/08/06$137,500
    Rhona DavidsonIntegration SpecialistTokyo552010/10/14$327,900
    Colleen HurstJavascript DeveloperSan Francisco392009/09/15$205,500
    Sonya FrostSoftware EngineerEdinburgh232008/12/13$103,600
    Jena GainesOffice ManagerLondon302008/12/19$90,560
    Quinn FlynnSupport LeadEdinburgh222013/03/03$342,000
    Charde MarshallRegional DirectorSan Francisco362008/10/16$470,600
    Haley KennedySenior Marketing DesignerLondon432012/12/18$313,500
    Tatyana FitzpatrickRegional DirectorLondon192010/03/17$385,750
    Michael SilvaMarketing DesignerLondon662012/11/27$198,500
    Paul ByrdChief Financial Officer (CFO)New York642010/06/09$725,000
    Gloria LittleSystems AdministratorNew York592009/04/10$237,500
    Bradley GreerSoftware EngineerLondon412012/10/13$132,000
    Dai RiosPersonnel LeadEdinburgh352012/09/26$217,500
    Jenette CaldwellDevelopment LeadNew York302011/09/03$345,000
    Yuri BerryChief Marketing Officer (CMO)New York402009/06/25$675,000
    Caesar VancePre-Sales SupportNew York212011/12/12$106,450
    Doris WilderSales AssistantSidney232010/09/20$85,600
    Angelica RamosChief Executive Officer (CEO)London472009/10/09$1,200,000
    Gavin JoyceDeveloperEdinburgh422010/12/22$92,575
    Jennifer ChangRegional DirectorSingapore282010/11/14$357,650
    Brenden WagnerSoftware EngineerSan Francisco282011/06/07$206,850
    Fiona GreenChief Operating Officer (COO)San Francisco482010/03/11$850,000
    Shou ItouRegional MarketingTokyo202011/08/14$163,000
    Michelle HouseIntegration SpecialistSidney372011/06/02$95,400
    Suki BurksDeveloperLondon532009/10/22$114,500
    Prescott BartlettTechnical AuthorLondon272011/05/07$145,000
    Gavin CortezTeam LeaderSan Francisco222008/10/26$235,500
    Martena MccrayPost-Sales supportEdinburgh462011/03/09$324,050
    Unity ButlerMarketing DesignerSan Francisco472009/12/09$85,675
    Howard HatfieldOffice ManagerSan Francisco512008/12/16$164,500
    Hope FuentesSecretarySan Francisco412010/02/12$109,850
    Vivian HarrellFinancial ControllerSan Francisco622009/02/14$452,500
    Timothy MooneyOffice ManagerLondon372008/12/11$136,200
    Jackson BradshawDirectorNew York652008/09/26$645,750
    Olivia LiangSupport EngineerSingapore642011/02/03$234,500
    Bruno NashSoftware EngineerLondon382011/05/03$163,500
    Sakura YamamotoSupport EngineerTokyo372009/08/19$139,575
    Thor WaltonDeveloperNew York612013/08/11$98,540
    Finn CamachoSupport EngineerSan Francisco472009/07/07$87,500
    Serge BaldwinData CoordinatorSingapore642012/04/09$138,575
    Zenaida FrankSoftware EngineerNew York632010/01/04$125,250
    Zorita SerranoSoftware EngineerSan Francisco562012/06/01$115,000
    Jennifer AcostaJunior Javascript DeveloperEdinburgh432013/02/01$75,650
    Cara StevensSales AssistantNew York462011/12/06$145,600
    Hermione ButlerRegional DirectorLondon472011/03/21$356,250
    Lael GreerSystems AdministratorLondon212009/02/27$103,500
    Jonas AlexanderDeveloperSan Francisco302010/07/14$86,500
    Shad DeckerRegional DirectorEdinburgh512008/11/13$183,000
    Michael BruceJavascript DeveloperSingapore292011/06/27$183,000
    Donna SniderCustomer SupportNew York272011/01/25$112,000
    
+
+			
      
+				
    • Javascript
      • 
+				
    • HTML
      • 
+				
    • CSS
      • 
+				
    • Ajax
      • 
+				
    • Server-side script
      • 
+			
    
+
+			
    
+				
    
+					
    The Javascript shown below is used to initialise the table shown in this
+					example:
    $(document).ready(function() {
+	$('#example').addClass('KeyTable');
+	new $.fn.dataTable.KeyTable();
+} );
+
+					
    In addition to the above code, the following Javascript library files are loaded for use in this
+					example:
    
+
+					
+				
    
+
+				
    
+					
    The HTML shown below is the raw HTML table element, before it has been enhanced by
+					DataTables:
    
+				
    
+
+				
    
+					
    
+						
    This example uses a little bit of additional CSS beyond what is loaded from the library
+						files (below), in order to correctly display the table. The additional CSS used is shown
+						below:
    
+					
    
+
+					
    The following CSS library files are loaded for use in this example to provide the styling of the
+					table:
    
+
+					
+				
    
+
+				
    
+					
    This table loads data by Ajax. The latest data that has been loaded is shown below. This data
+					will update automatically as any additional data is loaded.
    
+				
    
+
+				
    
+					
    The script used to perform the server-side processing for this table is shown below. Please note
+					that this is just an example script using PHP. Server-side processing scripts can be written in any
+					language, using the protocol described in the
+					DataTables documentation.
    
+				
    
+			
    
+		
    
+	
    
+
+	
    
+		
    
+			
    
+
+			
    
+				
    Other examples
    
+
+				
    
+					
    
+						
    Examples
    
+						
+					
    
+				
    
+
+				
    
+					
    Please refer to the DataTables documentation for full
+					information about its API properties and methods.
    
+					Additionally, there are a wide range of extras and
+					plug-ins which extend the capabilities of
+					DataTables.
    
+
+					
    DataTables designed and created by SpryMedia Ltd © 2007-2014
    
+					DataTables is licensed under the MIT license.
    
+				
    
+			
    
+		
    
+	
    
+
+
\ No newline at end of file
diff --git a/public/assets/plugins/datatables/extensions/KeyTable/examples/index.html b/public/assets/plugins/datatables/extensions/KeyTable/examples/index.html
new file mode 100644
index 00000000..71ab0a8f
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/KeyTable/examples/index.html
@@ -0,0 +1,69 @@
+
+
+
+	
+	
+	
+	
+	
+	
+	
+	
+
+	KeyTable examples - KeyTable examples
+
+
+
+	
    
+		
    
+			
    KeyTable example KeyTable examples
    
+
+			
    
+				
    KeyTable provides enhanced accessibility and navigation options for DataTables enhanced tables, by
+				allowing Excel like cell navigation on any table. Events (focus, blur, action etc) can be assigned to
+				individual cells, columns, rows or all cells to allow advanced interaction options.. Key features
+				include:
    
+
+				
      
+					
    • Easy to use spreadsheet like interaction
      • 
+					
    • Fully integrated with DataTables
      • 
+					
    • Wide range of supported events
      • 
+					
    • Works without DataTables if you just want a plain table
      • 
+				
    
+			
    
+		
    
+	
    
+
+	
    
+		
    
+			
    
+
+			
    
+				
    
+					
    
+						
    Examples
    
+						
+					
    
+				
    
+
+				
    
+					
    Please refer to the DataTables documentation for full
+					information about its API properties and methods.
    
+					Additionally, there are a wide range of extras and
+					plug-ins which extend the capabilities of
+					DataTables.
    
+
+					
    DataTables designed and created by SpryMedia Ltd © 2007-2014
    
+					DataTables is licensed under the MIT license.
    
+				
    
+			
    
+		
    
+	
    
+
+
\ No newline at end of file
diff --git a/public/assets/plugins/datatables/extensions/KeyTable/examples/scrolling.html b/public/assets/plugins/datatables/extensions/KeyTable/examples/scrolling.html
new file mode 100644
index 00000000..6df15805
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/KeyTable/examples/scrolling.html
@@ -0,0 +1,637 @@
+
+
+
+	
+	
+	
+
+	KeyTable example - Scrolling table
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
    
+		
    
+			
    KeyTable example Scrolling table
    
+
+			
    
+				
    KeyTable supports DataTables' scrolling options (scrollXDT and scrollYDT) without required any additional
+				configuration. As the navigation keys are used to alter the focus of the KeyTable, the DataTables
+				scrolling position is altered to show the focused cell.
    
+			
    
+
+			
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+				
+			
    NamePositionOfficeAgeStart dateSalary
    NamePositionOfficeAgeStart dateSalary
    Tiger NixonSystem ArchitectEdinburgh612011/04/25$320,800
    Garrett WintersAccountantTokyo632011/07/25$170,750
    Ashton CoxJunior Technical AuthorSan Francisco662009/01/12$86,000
    Cedric KellySenior Javascript DeveloperEdinburgh222012/03/29$433,060
    Airi SatouAccountantTokyo332008/11/28$162,700
    Brielle WilliamsonIntegration SpecialistNew York612012/12/02$372,000
    Herrod ChandlerSales AssistantSan Francisco592012/08/06$137,500
    Rhona DavidsonIntegration SpecialistTokyo552010/10/14$327,900
    Colleen HurstJavascript DeveloperSan Francisco392009/09/15$205,500
    Sonya FrostSoftware EngineerEdinburgh232008/12/13$103,600
    Jena GainesOffice ManagerLondon302008/12/19$90,560
    Quinn FlynnSupport LeadEdinburgh222013/03/03$342,000
    Charde MarshallRegional DirectorSan Francisco362008/10/16$470,600
    Haley KennedySenior Marketing DesignerLondon432012/12/18$313,500
    Tatyana FitzpatrickRegional DirectorLondon192010/03/17$385,750
    Michael SilvaMarketing DesignerLondon662012/11/27$198,500
    Paul ByrdChief Financial Officer (CFO)New York642010/06/09$725,000
    Gloria LittleSystems AdministratorNew York592009/04/10$237,500
    Bradley GreerSoftware EngineerLondon412012/10/13$132,000
    Dai RiosPersonnel LeadEdinburgh352012/09/26$217,500
    Jenette CaldwellDevelopment LeadNew York302011/09/03$345,000
    Yuri BerryChief Marketing Officer (CMO)New York402009/06/25$675,000
    Caesar VancePre-Sales SupportNew York212011/12/12$106,450
    Doris WilderSales AssistantSidney232010/09/20$85,600
    Angelica RamosChief Executive Officer (CEO)London472009/10/09$1,200,000
    Gavin JoyceDeveloperEdinburgh422010/12/22$92,575
    Jennifer ChangRegional DirectorSingapore282010/11/14$357,650
    Brenden WagnerSoftware EngineerSan Francisco282011/06/07$206,850
    Fiona GreenChief Operating Officer (COO)San Francisco482010/03/11$850,000
    Shou ItouRegional MarketingTokyo202011/08/14$163,000
    Michelle HouseIntegration SpecialistSidney372011/06/02$95,400
    Suki BurksDeveloperLondon532009/10/22$114,500
    Prescott BartlettTechnical AuthorLondon272011/05/07$145,000
    Gavin CortezTeam LeaderSan Francisco222008/10/26$235,500
    Martena MccrayPost-Sales supportEdinburgh462011/03/09$324,050
    Unity ButlerMarketing DesignerSan Francisco472009/12/09$85,675
    Howard HatfieldOffice ManagerSan Francisco512008/12/16$164,500
    Hope FuentesSecretarySan Francisco412010/02/12$109,850
    Vivian HarrellFinancial ControllerSan Francisco622009/02/14$452,500
    Timothy MooneyOffice ManagerLondon372008/12/11$136,200
    Jackson BradshawDirectorNew York652008/09/26$645,750
    Olivia LiangSupport EngineerSingapore642011/02/03$234,500
    Bruno NashSoftware EngineerLondon382011/05/03$163,500
    Sakura YamamotoSupport EngineerTokyo372009/08/19$139,575
    Thor WaltonDeveloperNew York612013/08/11$98,540
    Finn CamachoSupport EngineerSan Francisco472009/07/07$87,500
    Serge BaldwinData CoordinatorSingapore642012/04/09$138,575
    Zenaida FrankSoftware EngineerNew York632010/01/04$125,250
    Zorita SerranoSoftware EngineerSan Francisco562012/06/01$115,000
    Jennifer AcostaJunior Javascript DeveloperEdinburgh432013/02/01$75,650
    Cara StevensSales AssistantNew York462011/12/06$145,600
    Hermione ButlerRegional DirectorLondon472011/03/21$356,250
    Lael GreerSystems AdministratorLondon212009/02/27$103,500
    Jonas AlexanderDeveloperSan Francisco302010/07/14$86,500
    Shad DeckerRegional DirectorEdinburgh512008/11/13$183,000
    Michael BruceJavascript DeveloperSingapore292011/06/27$183,000
    Donna SniderCustomer SupportNew York272011/01/25$112,000
    
+
+			
      
+				
    • Javascript
      • 
+				
    • HTML
      • 
+				
    • CSS
      • 
+				
    • Ajax
      • 
+				
    • Server-side script
      • 
+			
    
+
+			
    
+				
    
+					
    The Javascript shown below is used to initialise the table shown in this
+					example:
    $(document).ready(function() {
+	var table = $('#example').DataTable( {
+		scrollY: 300,
+		paging: false
+	} );
+
+	new $.fn.dataTable.KeyTable( table );
+} );
+
+					
    In addition to the above code, the following Javascript library files are loaded for use in this
+					example:
    
+
+					
+				
    
+
+				
    
+					
    The HTML shown below is the raw HTML table element, before it has been enhanced by
+					DataTables:
    
+				
    
+
+				
    
+					
    
+						
    This example uses a little bit of additional CSS beyond what is loaded from the library
+						files (below), in order to correctly display the table. The additional CSS used is shown
+						below:
    
+					
    
+
+					
    The following CSS library files are loaded for use in this example to provide the styling of the
+					table:
    
+
+					
+				
    
+
+				
    
+					
    This table loads data by Ajax. The latest data that has been loaded is shown below. This data
+					will update automatically as any additional data is loaded.
    
+				
    
+
+				
    
+					
    The script used to perform the server-side processing for this table is shown below. Please note
+					that this is just an example script using PHP. Server-side processing scripts can be written in any
+					language, using the protocol described in the
+					DataTables documentation.
    
+				
    
+			
    
+		
    
+	
    
+
+	
    
+		
    
+			
    
+
+			
    
+				
    Other examples
    
+
+				
    
+					
    
+						
    Examples
    
+						
+					
    
+				
    
+
+				
    
+					
    Please refer to the DataTables documentation for full
+					information about its API properties and methods.
    
+					Additionally, there are a wide range of extras and
+					plug-ins which extend the capabilities of
+					DataTables.
    
+
+					
    DataTables designed and created by SpryMedia Ltd © 2007-2014
    
+					DataTables is licensed under the MIT license.
    
+				
    
+			
    
+		
    
+	
    
+
+
\ No newline at end of file
diff --git a/public/assets/plugins/datatables/extensions/KeyTable/examples/simple.html b/public/assets/plugins/datatables/extensions/KeyTable/examples/simple.html
new file mode 100644
index 00000000..e18ed1c6
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/KeyTable/examples/simple.html
@@ -0,0 +1,631 @@
+
+
+
+	
+	
+	
+
+	KeyTable example - Basic initialisation
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+
+
+
+	
    
+		
    
+			
    KeyTable example Basic initialisation
    
+
+			
    
+				
    KeyTable allows you to use keyboard navigation on a DataTables enhanced table, like an Excel
+				spreadsheet. The focused cell is shown through the CSS class ('focus') which in the case below is
+				simply a blue border. Use your keyboard's arrow keys and click the cells in the table to navigate.
    
+
+				
    This example simply shows key table being initialised on a DataTable, but events can be listened for through the KeyTable API which provide interaction
+				options.
    
+			
    
+
+			
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+				
+
+				
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+					
+						
+						
+						
+						
+						
+						
+					
+				
+			
    NamePositionOfficeAgeStart dateSalary
    NamePositionOfficeAgeStart dateSalary
    Tiger NixonSystem ArchitectEdinburgh612011/04/25$320,800
    Garrett WintersAccountantTokyo632011/07/25$170,750
    Ashton CoxJunior Technical AuthorSan Francisco662009/01/12$86,000
    Cedric KellySenior Javascript DeveloperEdinburgh222012/03/29$433,060
    Airi SatouAccountantTokyo332008/11/28$162,700
    Brielle WilliamsonIntegration SpecialistNew York612012/12/02$372,000
    Herrod ChandlerSales AssistantSan Francisco592012/08/06$137,500
    Rhona DavidsonIntegration SpecialistTokyo552010/10/14$327,900
    Colleen HurstJavascript DeveloperSan Francisco392009/09/15$205,500
    Sonya FrostSoftware EngineerEdinburgh232008/12/13$103,600
    Jena GainesOffice ManagerLondon302008/12/19$90,560
    Quinn FlynnSupport LeadEdinburgh222013/03/03$342,000
    Charde MarshallRegional DirectorSan Francisco362008/10/16$470,600
    Haley KennedySenior Marketing DesignerLondon432012/12/18$313,500
    Tatyana FitzpatrickRegional DirectorLondon192010/03/17$385,750
    Michael SilvaMarketing DesignerLondon662012/11/27$198,500
    Paul ByrdChief Financial Officer (CFO)New York642010/06/09$725,000
    Gloria LittleSystems AdministratorNew York592009/04/10$237,500
    Bradley GreerSoftware EngineerLondon412012/10/13$132,000
    Dai RiosPersonnel LeadEdinburgh352012/09/26$217,500
    Jenette CaldwellDevelopment LeadNew York302011/09/03$345,000
    Yuri BerryChief Marketing Officer (CMO)New York402009/06/25$675,000
    Caesar VancePre-Sales SupportNew York212011/12/12$106,450
    Doris WilderSales AssistantSidney232010/09/20$85,600
    Angelica RamosChief Executive Officer (CEO)London472009/10/09$1,200,000
    Gavin JoyceDeveloperEdinburgh422010/12/22$92,575
    Jennifer ChangRegional DirectorSingapore282010/11/14$357,650
    Brenden WagnerSoftware EngineerSan Francisco282011/06/07$206,850
    Fiona GreenChief Operating Officer (COO)San Francisco482010/03/11$850,000
    Shou ItouRegional MarketingTokyo202011/08/14$163,000
    Michelle HouseIntegration SpecialistSidney372011/06/02$95,400
    Suki BurksDeveloperLondon532009/10/22$114,500
    Prescott BartlettTechnical AuthorLondon272011/05/07$145,000
    Gavin CortezTeam LeaderSan Francisco222008/10/26$235,500
    Martena MccrayPost-Sales supportEdinburgh462011/03/09$324,050
    Unity ButlerMarketing DesignerSan Francisco472009/12/09$85,675
    Howard HatfieldOffice ManagerSan Francisco512008/12/16$164,500
    Hope FuentesSecretarySan Francisco412010/02/12$109,850
    Vivian HarrellFinancial ControllerSan Francisco622009/02/14$452,500
    Timothy MooneyOffice ManagerLondon372008/12/11$136,200
    Jackson BradshawDirectorNew York652008/09/26$645,750
    Olivia LiangSupport EngineerSingapore642011/02/03$234,500
    Bruno NashSoftware EngineerLondon382011/05/03$163,500
    Sakura YamamotoSupport EngineerTokyo372009/08/19$139,575
    Thor WaltonDeveloperNew York612013/08/11$98,540
    Finn CamachoSupport EngineerSan Francisco472009/07/07$87,500
    Serge BaldwinData CoordinatorSingapore642012/04/09$138,575
    Zenaida FrankSoftware EngineerNew York632010/01/04$125,250
    Zorita SerranoSoftware EngineerSan Francisco562012/06/01$115,000
    Jennifer AcostaJunior Javascript DeveloperEdinburgh432013/02/01$75,650
    Cara StevensSales AssistantNew York462011/12/06$145,600
    Hermione ButlerRegional DirectorLondon472011/03/21$356,250
    Lael GreerSystems AdministratorLondon212009/02/27$103,500
    Jonas AlexanderDeveloperSan Francisco302010/07/14$86,500
    Shad DeckerRegional DirectorEdinburgh512008/11/13$183,000
    Michael BruceJavascript DeveloperSingapore292011/06/27$183,000
    Donna SniderCustomer SupportNew York272011/01/25$112,000
    
+
+			
      
+				
    • Javascript
      • 
+				
    • HTML
      • 
+				
    • CSS
      • 
+				
    • Ajax
      • 
+				
    • Server-side script
      • 
+			
    
+
+			
    
+				
    
+					
    The Javascript shown below is used to initialise the table shown in this
+					example:
    $(document).ready(function() {
+	var table = $('#example').DataTable();
+
+	new $.fn.dataTable.KeyTable( table );
+} );
+
+					
    In addition to the above code, the following Javascript library files are loaded for use in this
+					example:
    
+
+					
+				
    
+
+				
    
+					
    The HTML shown below is the raw HTML table element, before it has been enhanced by
+					DataTables:
    
+				
    
+
+				
    
+					
    
+						
    This example uses a little bit of additional CSS beyond what is loaded from the library
+						files (below), in order to correctly display the table. The additional CSS used is shown
+						below:
    
+					
    
+
+					
    The following CSS library files are loaded for use in this example to provide the styling of the
+					table:
    
+
+					
+				
    
+
+				
    
+					
    This table loads data by Ajax. The latest data that has been loaded is shown below. This data
+					will update automatically as any additional data is loaded.
    
+				
    
+
+				
    
+					
    The script used to perform the server-side processing for this table is shown below. Please note
+					that this is just an example script using PHP. Server-side processing scripts can be written in any
+					language, using the protocol described in the
+					DataTables documentation.
    
+				
    
+			
    
+		
    
+	
    
+
+	
    
+		
    
+			
    
+
+			
    
+				
    Other examples
    
+
+				
    
+					
    
+						
    Examples
    
+						
+					
    
+				
    
+
+				
    
+					
    Please refer to the DataTables documentation for full
+					information about its API properties and methods.
    
+					Additionally, there are a wide range of extras and
+					plug-ins which extend the capabilities of
+					DataTables.
    
+
+					
    DataTables designed and created by SpryMedia Ltd © 2007-2014
    
+					DataTables is licensed under the MIT license.
    
+				
    
+			
    
+		
    
+	
    
+
+
\ No newline at end of file
diff --git a/public/assets/plugins/datatables/extensions/KeyTable/js/dataTables.keyTable.js b/public/assets/plugins/datatables/extensions/KeyTable/js/dataTables.keyTable.js
new file mode 100644
index 00000000..f303f766
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/KeyTable/js/dataTables.keyTable.js
@@ -0,0 +1,1175 @@
+/*! KeyTable 1.2.1
+ * ©2010-2014 SpryMedia Ltd - datatables.net/license
+ */
+
+/**
+ * @summary     KeyTable
+ * @description Spreadsheet like keyboard navigation for DataTables
+ * @version     1.2.1
+ * @file        dataTables.keyTable.js
+ * @author      SpryMedia Ltd (www.sprymedia.co.uk)
+ * @contact     www.sprymedia.co.uk/contact
+ * @copyright   Copyright 2009-2014 SpryMedia Ltd.
+ *
+ * This source file is free software, available under the following license:
+ *   MIT license - http://datatables.net/license/mit
+ *
+ * This source file is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the license files for details.
+ *
+ * For details please refer to: http://www.datatables.net
+ */
+
+// Global scope for KeyTable for backwards compatibility. Will be removed in 1.3
+var KeyTable;
+
+
+(function(window, document, undefined) {
+
+
+var factory = function( $, DataTable ) {
+"use strict";
+
+KeyTable = function ( oInit )
+{
+	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+	 * API parameters
+	 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+	/*
+	 * Variable: block
+	 * Purpose:  Flag whether or not KeyTable events should be processed
+	 * Scope:    KeyTable - public
+	 */
+	this.block = false;
+
+	/*
+	 * Variable: event
+	 * Purpose:  Container for all event application methods
+	 * Scope:    KeyTable - public
+	 * Notes:    This object contains all the public methods for adding and removing events - these
+	 *           are dynamically added later on
+	 */
+	this.event = {
+		"remove": {}
+	};
+
+
+	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+	 * API methods
+	 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+	/*
+	 * Function: fnGetCurrentPosition
+	 * Purpose:  Get the currently focused cell's position
+	 * Returns:  array int: [ x, y ]
+	 * Inputs:   void
+	 */
+	this.fnGetCurrentPosition = function ()
+	{
+		return [ _iOldX, _iOldY ];
+	};
+
+
+	/*
+	 * Function: fnGetCurrentData
+	 * Purpose:  Get the currently focused cell's data (innerHTML)
+	 * Returns:  string: - data requested
+	 * Inputs:   void
+	 */
+	this.fnGetCurrentData = function ()
+	{
+		return _nOldFocus.innerHTML;
+	};
+
+
+	/*
+	 * Function: fnGetCurrentTD
+	 * Purpose:  Get the currently focused cell
+	 * Returns:  node: - focused element
+	 * Inputs:   void
+	 */
+	this.fnGetCurrentTD = function ()
+	{
+		return _nOldFocus;
+	};
+
+
+	/*
+	 * Function: fnSetPosition
+	 * Purpose:  Set the position of the focused cell
+	 * Returns:  -
+	 * Inputs:   int:x - x coordinate
+	 *           int:y - y coordinate
+	 * Notes:    Thanks to Rohan Daxini for the basis of this function
+	 */
+	this.fnSetPosition = function( x, y )
+	{
+		if ( typeof x == 'object' && x.nodeName )
+		{
+			_fnSetFocus( x );
+		}
+		else
+		{
+			_fnSetFocus( _fnCellFromCoords(x, y) );
+		}
+	};
+
+
+	/*
+	 * Function: fnBlur
+	 * Purpose:  Blur the current focus
+	 * Returns:  -
+	 * Inputs:   -
+	 */
+	this.fnBlur = function()
+	{
+		_fnBlur();
+	};
+
+
+	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+	 * Private parameters
+	 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+	/*
+	 * Variable: _nBody
+	 * Purpose:  Body node of the table - cached for renference
+	 * Scope:    KeyTable - private
+	 */
+	var _nBody = null;
+
+	/*
+	 * Variable: 
+	 * Purpose:  
+	 * Scope:    KeyTable - private
+	 */
+	var _nOldFocus = null;
+
+	/*
+	 * Variable: _iOldX and _iOldY
+	 * Purpose:  X and Y coords of the old elemet that was focused on
+	 * Scope:    KeyTable - private
+	 */
+	var _iOldX = null;
+	var _iOldY = null;
+
+	/*
+	 * Variable: _that
+	 * Purpose:  Scope saving for 'this' after a jQuery event
+	 * Scope:    KeyTable - private
+	 */
+	var _that = null;
+
+	/*
+	 * Variable: sFocusClass
+	 * Purpose:  Class that should be used for focusing on a cell
+	 * Scope:    KeyTable - private
+	 */
+	var _sFocusClass = "focus";
+
+	/*
+	 * Variable: _bKeyCapture
+	 * Purpose:  Flag for should KeyTable capture key events or not
+	 * Scope:    KeyTable - private
+	 */
+	var _bKeyCapture = false;
+
+	/*
+	 * Variable: _oaoEvents
+	 * Purpose:  Event cache object, one array for each supported event for speed of searching
+	 * Scope:    KeyTable - private
+	 */
+	var _oaoEvents = {
+		"action": [],
+		"esc": [],
+		"focus": [],
+		"blur": []
+	};
+
+	/*
+	 * Variable: _oDatatable
+	 * Purpose:  DataTables settings object for if we are actually using a 
+	 *           DataTables table
+	 * Scope:    KeyTable - private
+	 */
+	var _oDatatable = null;
+
+	var _bForm;
+	var _nInput;
+	var _bInputFocused = false;
+
+
+	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+	 * Private methods
+	 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+	 * Key table events
+	 */
+
+	/*
+	 * Function: _fnEventAddTemplate
+	 * Purpose:  Create a function (with closure for sKey) event addition API
+	 * Returns:  function: - template function
+	 * Inputs:   string:sKey - type of event to detect
+	 */
+	function _fnEventAddTemplate( sKey )
+	{
+		/*
+		 * Function: -
+		 * Purpose:  API function for adding event to cache
+		 * Returns:  -
+		 * Inputs:   1. node:x - target node to add event for
+		 *           2. function:y - callback function to apply
+		 *         or
+		 *           1. int:x - x coord. of target cell (can be null for live events)
+		 *           2. int:y - y coord. of target cell (can be null for live events)
+		 *           3. function:z - callback function to apply
+		 * Notes:    This function is (interally) overloaded (in as much as javascript allows for
+		 *           that) - the target cell can be given by either node or coords.
+		 */
+		return function ( x, y, z ) {
+			if ( (x===null || typeof x == "number") &&
+				 (y===null || typeof y == "number") &&
+				 typeof z == "function" )
+			{
+				_fnEventAdd( sKey, x, y, z );
+			}
+			else if ( typeof x == "object" && typeof y == "function" )
+			{
+				var aCoords = _fnCoordsFromCell( x );
+				_fnEventAdd( sKey, aCoords[0], aCoords[1], y );
+			}
+			else
+			{
+				alert( "Unhandable event type was added: x" +x+ "  y:" +y+ "  z:" +z );
+			}
+		};
+	}
+
+
+	/*
+	 * Function: _fnEventRemoveTemplate
+	 * Purpose:  Create a function (with closure for sKey) event removal API
+	 * Returns:  function: - template function
+	 * Inputs:   string:sKey - type of event to detect
+	 */
+	function _fnEventRemoveTemplate( sKey )
+	{
+		/*
+		 * Function: -
+		 * Purpose:  API function for removing event from cache
+		 * Returns:  int: - number of events removed
+		 * Inputs:   1. node:x - target node to remove event from
+		 *           2. function:y - callback function to apply
+		 *         or
+		 *           1. int:x - x coord. of target cell (can be null for live events)
+		 *           2. int:y - y coord. of target cell (can be null for live events)
+		 *           3. function:z - callback function to remove - optional
+		 * Notes:    This function is (interally) overloaded (in as much as javascript allows for
+		 *           that) - the target cell can be given by either node or coords and the function
+		 *           to remove is optional
+		 */
+		return function ( x, y, z ) {
+			if ( (x===null || typeof arguments[0] == "number") &&
+				 (y===null || typeof arguments[1] == "number" ) )
+			{
+				if ( typeof arguments[2] == "function" )
+				{
+					_fnEventRemove( sKey, x, y, z );
+				}
+				else
+				{
+					_fnEventRemove( sKey, x, y );
+				}
+			}
+			else if ( typeof arguments[0] == "object" )
+			{
+				var aCoords = _fnCoordsFromCell( x );
+				if ( typeof arguments[1] == "function" )
+				{
+					_fnEventRemove( sKey, aCoords[0], aCoords[1], y );
+				}
+				else
+				{
+					_fnEventRemove( sKey, aCoords[0], aCoords[1] );
+				}
+			}
+			else
+			{
+				alert( "Unhandable event type was removed: x" +x+ "  y:" +y+ "  z:" +z );
+			}
+		};
+	}
+
+	/* Use the template functions to add the event API functions */
+	for ( var sKey in _oaoEvents )
+	{
+		if ( sKey )
+		{
+			this.event[sKey] = _fnEventAddTemplate( sKey );
+			this.event.remove[sKey] = _fnEventRemoveTemplate( sKey );
+		}
+	}
+
+
+	/*
+	 * Function: _fnEventAdd
+	 * Purpose:  Add an event to the internal cache
+	 * Returns:  -
+	 * Inputs:   string:sType - type of event to add, given by the available elements in _oaoEvents
+	 *           int:x - x-coords to add event to - can be null for "blanket" event
+	 *           int:y - y-coords to add event to - can be null for "blanket" event
+	 *           function:fn - callback function for when triggered
+	 */
+	function _fnEventAdd( sType, x, y, fn )
+	{
+		_oaoEvents[sType].push( {
+			"x": x,
+			"y": y,
+			"fn": fn
+		} );
+	}
+
+
+	/*
+	 * Function: _fnEventRemove
+	 * Purpose:  Remove an event from the event cache
+	 * Returns:  int: - number of matching events removed
+	 * Inputs:   string:sType - type of event to look for
+	 *           node:nTarget - target table cell
+	 *           function:fn - optional - remove this function. If not given all handlers of this
+	 *             type will be removed
+	 */
+	function _fnEventRemove( sType, x, y, fn )
+	{
+		var iCorrector = 0;
+
+		for ( var i=0, iLen=_oaoEvents[sType].length ; i= oSettings.fnDisplayEnd() )
+			{
+				if ( oSettings._iDisplayLength >= 0 )
+				{
+					/* Make sure we are not over running the display array */
+					if ( oSettings._iDisplayStart + oSettings._iDisplayLength < oSettings.fnRecordsDisplay() )
+					{
+						oSettings._iDisplayStart += oSettings._iDisplayLength;
+					}
+				}
+				else
+				{
+					oSettings._iDisplayStart = 0;
+				}
+				_oDatatable.oApi._fnCalculateEnd( oSettings );
+			}
+
+			/* Page backwards */
+			while ( iRow < oSettings._iDisplayStart )
+			{
+				oSettings._iDisplayStart = oSettings._iDisplayLength>=0 ?
+					oSettings._iDisplayStart - oSettings._iDisplayLength :
+					0;
+
+				if ( oSettings._iDisplayStart < 0 )
+				{
+				  oSettings._iDisplayStart = 0;
+				}
+				_oDatatable.oApi._fnCalculateEnd( oSettings );
+			}
+
+			/* Re-draw the table */
+			_oDatatable.oApi._fnDraw( oSettings );
+
+			/* Restore the key capture */
+			_bKeyCapture = bKeyCaptureCache;
+		}
+
+		/* Cache the information that we are interested in */
+		var aNewPos = _fnCoordsFromCell( nTarget );
+		_nOldFocus = nTarget;
+		_iOldX = aNewPos[0];
+		_iOldY = aNewPos[1];
+
+		var iViewportHeight, iViewportWidth, iScrollTop, iScrollLeft, iHeight, iWidth, aiPos;
+		if ( bAutoScroll )
+		{
+			/* Scroll the viewport such that the new cell is fully visible in the rendered window */
+			iViewportHeight = $(window).height();
+			iViewportWidth = $(window).width();
+			iScrollTop = $(document).scrollTop();
+			iScrollLeft = $(document).scrollLeft();
+			iHeight = nTarget.offsetHeight;
+			iWidth = nTarget.offsetWidth;
+			aiPos = _fnGetPos( nTarget );
+
+			/* Take account of scrolling in DataTables 1.7 - remove scrolling since that would add to
+			 * the positioning calculation
+			 */
+			if ( _oDatatable && typeof oSettings.oScroll != 'undefined' &&
+			  (oSettings.oScroll.sX !== "" || oSettings.oScroll.sY !== "") )
+			{
+				aiPos[1] -= $(oSettings.nTable.parentNode).scrollTop();
+				aiPos[0] -= $(oSettings.nTable.parentNode).scrollLeft();
+			}
+
+			/* Correct viewport positioning for vertical scrolling */
+			if ( aiPos[1]+iHeight > iScrollTop+iViewportHeight )
+			{
+				/* Displayed element if off the bottom of the viewport */
+				_fnSetScrollTop( aiPos[1]+iHeight - iViewportHeight );
+			}
+			else if ( aiPos[1] < iScrollTop )
+			{
+				/* Displayed element if off the top of the viewport */
+				_fnSetScrollTop( aiPos[1] );
+			}
+
+			/* Correct viewport positioning for horizontal scrolling */
+			if ( aiPos[0]+iWidth > iScrollLeft+iViewportWidth )
+			{
+				/* Displayed element is off the bottom of the viewport */
+				_fnSetScrollLeft( aiPos[0]+iWidth - iViewportWidth );
+			}
+			else if ( aiPos[0] < iScrollLeft )
+			{
+				/* Displayed element if off the Left of the viewport */
+				_fnSetScrollLeft( aiPos[0] );
+			}
+		}
+
+		/* Take account of scrolling in DataTables 1.7 */
+		if ( _oDatatable && typeof oSettings.oScroll != 'undefined' &&
+		  (oSettings.oScroll.sX !== "" || oSettings.oScroll.sY !== "") )
+		{
+			var dtScrollBody = oSettings.nTable.parentNode;
+			iViewportHeight = dtScrollBody.clientHeight;
+			iViewportWidth = dtScrollBody.clientWidth;
+			iScrollTop = dtScrollBody.scrollTop;
+			iScrollLeft = dtScrollBody.scrollLeft;
+			iHeight = nTarget.offsetHeight;
+			iWidth = nTarget.offsetWidth;
+
+			/* Correct for vertical scrolling */
+			if ( nTarget.offsetTop + iHeight > iViewportHeight+iScrollTop )
+			{
+				dtScrollBody.scrollTop = (nTarget.offsetTop + iHeight) - iViewportHeight;
+			}
+			else if ( nTarget.offsetTop < iScrollTop )
+			{
+				dtScrollBody.scrollTop = nTarget.offsetTop;
+			}
+
+			/* Correct for horizontal scrolling */
+			if ( nTarget.offsetLeft + iWidth > iViewportWidth+iScrollLeft )
+			{
+				dtScrollBody.scrollLeft = (nTarget.offsetLeft + iWidth) - iViewportWidth;
+			}
+			else if ( nTarget.offsetLeft < iScrollLeft )
+			{
+				dtScrollBody.scrollLeft = nTarget.offsetLeft;
+			}
+		}
+
+		/* Focused - so we want to capture the keys */
+		_fnCaptureKeys();
+
+		/* Fire of the focus event if there is one */
+		_fnEventFire( "focus", _iOldX, _iOldY );
+	}
+
+
+	/*
+	 * Function: _fnBlur
+	 * Purpose:  Blur focus from the whole table
+	 * Returns:  -
+	 * Inputs:   -
+	 */
+	function _fnBlur()
+	{
+		_fnRemoveFocus( _nOldFocus );
+		_iOldX = null;
+		_iOldY = null;
+		_nOldFocus = null;
+		_fnReleaseKeys();
+	}
+
+
+	/*
+	 * Function: _fnRemoveFocus
+	 * Purpose:  Remove focus from a cell and fire any blur events which are attached
+	 * Returns:  -
+	 * Inputs:   node:nTarget - cell of interest
+	 */
+	function _fnRemoveFocus( nTarget )
+	{
+		$(nTarget).removeClass( _sFocusClass );
+		$(nTarget).parent().removeClass( _sFocusClass );
+		_fnEventFire( "blur", _iOldX, _iOldY );
+	}
+
+
+	/*
+	 * Function: _fnClick
+	 * Purpose:  Focus on the element that has been clicked on by the user
+	 * Returns:  -
+	 * Inputs:   event:e - click event
+	 */
+	function _fnClick ( e )
+	{
+		var nTarget = this;
+		while ( nTarget.nodeName != "TD" )
+		{
+			nTarget = nTarget.parentNode;
+		}
+
+		_fnSetFocus( nTarget );
+		_fnCaptureKeys();
+	}
+
+
+
+	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+	 * Key events
+	 */
+
+	/*
+	 * Function: _fnKey
+	 * Purpose:  Deal with a key events, be it moving the focus or return etc.
+	 * Returns:  bool: - allow browser default action
+	 * Inputs:   event:e - key event
+	 */
+	function _fnKey ( e )
+	{
+		/* If user or system has blocked KeyTable from doing anything, just ignore this event */
+		if ( _that.block || !_bKeyCapture )
+		{
+			return true;
+		}
+
+		/* If a modifier key is pressed (exapct shift), ignore the event */
+		if ( e.metaKey || e.altKey || e.ctrlKey )
+		{
+			return true;
+		}
+		var
+			x, y,
+			iTableWidth = _nBody.getElementsByTagName('tr')[0].getElementsByTagName('td').length,
+			iTableHeight;
+
+		/* Get table height and width - done here so as to be dynamic (if table is updated) */
+		if ( _oDatatable )
+		{
+			/* 
+			 * Locate the current node in the DataTable overriding the old positions - the reason for
+			 * is is that there might have been some DataTables interaction between the last focus and
+			 * now
+			 */
+			iTableHeight = _oDatatable.aiDisplay.length;
+
+			var aDtPos = _fnFindDtCell( _nOldFocus );
+			if ( aDtPos === null )
+			{
+				/* If the table has been updated such that the focused cell can't be seen - do nothing */
+				return;
+			}
+			_iOldX = aDtPos[ 0 ];
+			_iOldY = aDtPos[ 1 ];
+		}
+		else
+		{
+			iTableHeight = _nBody.getElementsByTagName('tr').length;
+		}
+
+		/* Capture shift+tab to match the left arrow key */
+		var iKey = (e.keyCode == 9 && e.shiftKey) ? -1 : e.keyCode;
+
+		switch( iKey )
+		{
+			case 13: /* return */
+				e.preventDefault();
+				e.stopPropagation();
+				_fnEventFire( "action", _iOldX, _iOldY );
+				return true;
+
+			case 27: /* esc */
+				if ( !_fnEventFire( "esc", _iOldX, _iOldY ) )
+				{
+					/* Only lose focus if there isn't an escape handler on the cell */
+					_fnBlur();
+					return;
+				}
+				x = _iOldX;
+				y = _iOldY;
+				break;
+
+			case -1:
+			case 37: /* left arrow */
+				if ( _iOldX > 0 ) {
+					x = _iOldX - 1;
+					y = _iOldY;
+				} else if ( _iOldY > 0 ) {
+					x = iTableWidth-1;
+					y = _iOldY - 1;
+				} else {
+					/* at start of table */
+					if ( iKey == -1 && _bForm )
+					{
+						/* If we are in a form, return focus to the 'input' element such that tabbing will
+						 * follow correctly in the browser
+						 */
+						_bInputFocused = true;
+						_nInput.focus();
+
+						/* This timeout is a little nasty - but IE appears to have some asyhnc behaviour for 
+						 * focus
+						 */
+						setTimeout( function(){ _bInputFocused = false; }, 0 );
+						_bKeyCapture = false;
+						_fnBlur();
+						return true;
+					}
+					else
+					{
+						return false;
+					}
+				}
+				break;
+
+			case 38: /* up arrow */
+				if ( _iOldY > 0 ) {
+					x = _iOldX;
+					y = _iOldY - 1;
+				} else {
+					return false;
+				}
+				break;
+
+			case 36: /* home */
+				x = _iOldX;
+				y = 0;
+				break;
+
+			case 33: /* page up */
+				x = _iOldX;
+				y = _iOldY - 10;
+				if (y < 0) {
+					y = 0;
+				}
+				break;
+
+			case 9: /* tab */
+			case 39: /* right arrow */
+				if ( _iOldX < iTableWidth-1 ) {
+					x = _iOldX + 1;
+					y = _iOldY;
+				} else if ( _iOldY < iTableHeight-1 ) {
+					x = 0;
+					y = _iOldY + 1;
+				} else {
+					/* at end of table */
+					if ( iKey == 9 && _bForm )
+					{
+						/* If we are in a form, return focus to the 'input' element such that tabbing will
+						 * follow correctly in the browser
+						 */
+						_bInputFocused = true;
+						_nInput.focus();
+
+						/* This timeout is a little nasty - but IE appears to have some asyhnc behaviour for 
+						 * focus
+						 */
+						setTimeout( function(){ _bInputFocused = false; }, 0 );
+						_bKeyCapture = false;
+						_fnBlur();
+						return true;
+					}
+					else
+					{
+						return false;
+					}
+				}
+				break;
+
+			case 40: /* down arrow */
+				if ( _iOldY < iTableHeight-1 ) {
+					x = _iOldX;
+					y = _iOldY + 1;
+				} else {
+					return false;
+				}
+				break;
+
+			case 35: /* end */
+				x = _iOldX;
+				y = iTableHeight-1;
+				break;
+
+			case 34: /* page down */
+				x = _iOldX;
+				y = _iOldY+10;
+				if (y > iTableHeight-1) {
+					y = iTableHeight-1;
+				}
+				break;
+
+			default: /* Nothing we are interested in */
+				return true;
+		}
+
+		_fnSetFocus( _fnCellFromCoords(x, y) );
+		return false;
+	}
+
+
+	/*
+	 * Function: _fnCaptureKeys
+	 * Purpose:  Start capturing key events for this table
+	 * Returns:  -
+	 * Inputs:   -
+	 */
+	function _fnCaptureKeys( )
+	{
+		if ( !_bKeyCapture )
+		{
+			_bKeyCapture = true;
+		}
+	}
+
+
+	/*
+	 * Function: _fnReleaseKeys
+	 * Purpose:  Stop capturing key events for this table
+	 * Returns:  -
+	 * Inputs:   -
+	 */
+	function _fnReleaseKeys( )
+	{
+		_bKeyCapture = false;
+	}
+
+
+
+	/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+	 * Support functions
+	 */
+
+	/*
+	 * Function: _fnCellFromCoords
+	 * Purpose:  Calulate the target TD cell from x and y coordinates
+	 * Returns:  node: - TD target
+	 * Inputs:   int:x - x coordinate
+	 *           int:y - y coordinate
+	 */
+	function _fnCellFromCoords( x, y )
+	{
+		if ( _oDatatable )
+		{
+			if ( typeof _oDatatable.aoData[ _oDatatable.aiDisplay[ y ] ] != 'undefined' )
+			{
+				return _oDatatable.aoData[ _oDatatable.aiDisplay[ y ] ].nTr.getElementsByTagName('td')[x];
+			}
+			else
+			{
+				return null;
+			}
+		}
+		else
+		{
+			return $('tr:eq('+y+')>td:eq('+x+')', _nBody )[0];
+		}
+	}
+
+
+	/*
+	 * Function: _fnCoordsFromCell
+	 * Purpose:  Calculate the x and y position in a table from a TD cell
+	 * Returns:  array[2] int: [x, y]
+	 * Inputs:   node:n - TD cell of interest
+	 * Notes:    Not actually interested in this for DataTables since it might go out of date
+	 */
+	function _fnCoordsFromCell( n )
+	{
+		if ( _oDatatable )
+		{
+			return [
+				$('td', n.parentNode).index(n),
+				$('tr', n.parentNode.parentNode).index(n.parentNode) + _oDatatable._iDisplayStart
+			];
+		}
+		else
+		{
+			return [
+				$('td', n.parentNode).index(n),
+				$('tr', n.parentNode.parentNode).index(n.parentNode)
+			];
+		}
+	}
+
+
+	/*
+	 * Function: _fnSetScrollTop
+	 * Purpose:  Set the vertical scrolling position
+	 * Returns:  -
+	 * Inputs:   int:iPos - scrolltop
+	 * Notes:    This is so nasty, but without browser detection you can't tell which you should set
+	 *           So on browsers that support both, the scroll top will be set twice. I can live with
+	 *           that :-)
+	 */
+	function _fnSetScrollTop( iPos )
+	{
+		document.documentElement.scrollTop = iPos;
+		document.body.scrollTop = iPos;
+	}
+
+
+	/*
+	 * Function: _fnSetScrollLeft
+	 * Purpose:  Set the horizontal scrolling position
+	 * Returns:  -
+	 * Inputs:   int:iPos - scrollleft
+	 */
+	function _fnSetScrollLeft( iPos )
+	{
+		document.documentElement.scrollLeft = iPos;
+		document.body.scrollLeft = iPos;
+	}
+
+
+	/*
+	 * Function: _fnGetPos
+	 * Purpose:  Get the position of an object on the rendered page
+	 * Returns:  array[2] int: [left, right]
+	 * Inputs:   node:obj - element of interest
+	 */
+	function _fnGetPos ( obj )
+	{
+		var iLeft = 0;
+		var iTop = 0;
+
+		if (obj.offsetParent)
+		{
+			iLeft = obj.offsetLeft;
+			iTop = obj.offsetTop;
+			obj = obj.offsetParent;
+			while (obj)
+			{
+				iLeft += obj.offsetLeft;
+				iTop += obj.offsetTop;
+				obj = obj.offsetParent;
+			}
+		}
+		return [iLeft,iTop];
+	}
+
+
+	/*
+	 * Function: _fnFindDtCell
+	 * Purpose:  Get the coords. of a cell from the DataTables internal information
+	 * Returns:  array[2] int: [x, y] coords. or null if not found
+	 * Inputs:   node:nTarget - the node of interest
+	 */
+	function _fnFindDtCell( nTarget )
+	{
+		for ( var i=0, iLen=_oDatatable.aiDisplay.length ; i
    '+
+				'
    Copied '+lines+' row'+plural+' to the clipboard.
    ',
+				1500
+			);
+		}
+	} ),
+
+	"pdf": $.extend( {}, TableTools.buttonBase, {
+		"sAction": "flash_pdf",
+		"sNewLine": "\n",
+		"sFileName": "*.pdf",
+		"sButtonClass": "DTTT_button_pdf",
+		"sButtonText": "PDF",
+		"sPdfOrientation": "portrait",
+		"sPdfSize": "A4",
+		"sPdfMessage": "",
+		"fnClick": function( nButton, oConfig, flash ) {
+			this.fnSetText( flash,
+				"title:"+ this.fnGetTitle(oConfig) +"\n"+
+				"message:"+ oConfig.sPdfMessage +"\n"+
+				"colWidth:"+ this.fnCalcColRatios(oConfig) +"\n"+
+				"orientation:"+ oConfig.sPdfOrientation +"\n"+
+				"size:"+ oConfig.sPdfSize +"\n"+
+				"--/TableToolsOpts--\n" +
+				this.fnGetTableData(oConfig)
+			);
+		}
+	} ),
+
+	"print": $.extend( {}, TableTools.buttonBase, {
+		"sInfo": "
    Print view
    Please use your browser's print function to "+
+		  "print this table. Press escape when finished.
    ",
+		"sMessage": null,
+		"bShowAll": true,
+		"sToolTip": "View print view",
+		"sButtonClass": "DTTT_button_print",
+		"sButtonText": "Print",
+		"fnClick": function ( nButton, oConfig ) {
+			this.fnPrint( true, oConfig );
+		}
+	} ),
+
+	"text": $.extend( {}, TableTools.buttonBase ),
+
+	"select": $.extend( {}, TableTools.buttonBase, {
+		"sButtonText": "Select button",
+		"fnSelect": function( nButton, oConfig ) {
+			if ( this.fnGetSelected().length !== 0 ) {
+				$(nButton).removeClass( this.classes.buttons.disabled );
+			} else {
+				$(nButton).addClass( this.classes.buttons.disabled );
+			}
+		},
+		"fnInit": function( nButton, oConfig ) {
+			$(nButton).addClass( this.classes.buttons.disabled );
+		}
+	} ),
+
+	"select_single": $.extend( {}, TableTools.buttonBase, {
+		"sButtonText": "Select button",
+		"fnSelect": function( nButton, oConfig ) {
+			var iSelected = this.fnGetSelected().length;
+			if ( iSelected == 1 ) {
+				$(nButton).removeClass( this.classes.buttons.disabled );
+			} else {
+				$(nButton).addClass( this.classes.buttons.disabled );
+			}
+		},
+		"fnInit": function( nButton, oConfig ) {
+			$(nButton).addClass( this.classes.buttons.disabled );
+		}
+	} ),
+
+	"select_all": $.extend( {}, TableTools.buttonBase, {
+		"sButtonText": "Select all",
+		"fnClick": function( nButton, oConfig ) {
+			this.fnSelectAll();
+		},
+		"fnSelect": function( nButton, oConfig ) {
+			if ( this.fnGetSelected().length == this.s.dt.fnRecordsDisplay() ) {
+				$(nButton).addClass( this.classes.buttons.disabled );
+			} else {
+				$(nButton).removeClass( this.classes.buttons.disabled );
+			}
+		}
+	} ),
+
+	"select_none": $.extend( {}, TableTools.buttonBase, {
+		"sButtonText": "Deselect all",
+		"fnClick": function( nButton, oConfig ) {
+			this.fnSelectNone();
+		},
+		"fnSelect": function( nButton, oConfig ) {
+			if ( this.fnGetSelected().length !== 0 ) {
+				$(nButton).removeClass( this.classes.buttons.disabled );
+			} else {
+				$(nButton).addClass( this.classes.buttons.disabled );
+			}
+		},
+		"fnInit": function( nButton, oConfig ) {
+			$(nButton).addClass( this.classes.buttons.disabled );
+		}
+	} ),
+
+	"ajax": $.extend( {}, TableTools.buttonBase, {
+		"sAjaxUrl": "/xhr.php",
+		"sButtonText": "Ajax button",
+		"fnClick": function( nButton, oConfig ) {
+			var sData = this.fnGetTableData(oConfig);
+			$.ajax( {
+				"url": oConfig.sAjaxUrl,
+				"data": [
+					{ "name": "tableData", "value": sData }
+				],
+				"success": oConfig.fnAjaxComplete,
+				"dataType": "json",
+				"type": "POST",
+				"cache": false,
+				"error": function () {
+					alert( "Error detected when sending table data to server" );
+				}
+			} );
+		},
+		"fnAjaxComplete": function( json ) {
+			alert( 'Ajax complete' );
+		}
+	} ),
+
+	"div": $.extend( {}, TableTools.buttonBase, {
+		"sAction": "div",
+		"sTag": "div",
+		"sButtonClass": "DTTT_nonbutton",
+		"sButtonText": "Text button"
+	} ),
+
+	"collection": $.extend( {}, TableTools.buttonBase, {
+		"sAction": "collection",
+		"sButtonClass": "DTTT_button_collection",
+		"sButtonText": "Collection",
+		"fnClick": function( nButton, oConfig ) {
+			this._fnCollectionShow(nButton, oConfig);
+		}
+	} )
+};
+/*
+ *  on* callback parameters:
+ *     1. node - button element
+ *     2. object - configuration object for this button
+ *     3. object - ZeroClipboard reference (flash button only)
+ *     4. string - Returned string from Flash (flash button only - and only on 'complete')
+ */
+
+// Alias to match the other plug-ins styling
+TableTools.buttons = TableTools.BUTTONS;
+
+
+/**
+ * @namespace Classes used by TableTools - allows the styles to be override easily.
+ *   Note that when TableTools initialises it will take a copy of the classes object
+ *   and will use its internal copy for the remainder of its run time.
+ */
+TableTools.classes = {
+	"container": "DTTT_container",
+	"buttons": {
+		"normal": "DTTT_button",
+		"disabled": "DTTT_disabled"
+	},
+	"collection": {
+		"container": "DTTT_collection",
+		"background": "DTTT_collection_background",
+		"buttons": {
+			"normal": "DTTT_button",
+			"disabled": "DTTT_disabled"
+		}
+	},
+	"select": {
+		"table": "DTTT_selectable",
+		"row": "DTTT_selected selected"
+	},
+	"print": {
+		"body": "DTTT_Print",
+		"info": "DTTT_print_info",
+		"message": "DTTT_PrintMessage"
+	}
+};
+
+
+/**
+ * @namespace ThemeRoller classes - built in for compatibility with DataTables' 
+ *   bJQueryUI option.
+ */
+TableTools.classes_themeroller = {
+	"container": "DTTT_container ui-buttonset ui-buttonset-multi",
+	"buttons": {
+		"normal": "DTTT_button ui-button ui-state-default"
+	},
+	"collection": {
+		"container": "DTTT_collection ui-buttonset ui-buttonset-multi"
+	}
+};
+
+
+/**
+ * @namespace TableTools default settings for initialisation
+ */
+TableTools.DEFAULTS = {
+	"sSwfPath":        "../swf/copy_csv_xls_pdf.swf",
+	"sRowSelect":      "none",
+	"sRowSelector":    "tr",
+	"sSelectedClass":  null,
+	"fnPreRowSelect":  null,
+	"fnRowSelected":   null,
+	"fnRowDeselected": null,
+	"aButtons":        [ "copy", "csv", "xls", "pdf", "print" ],
+	"oTags": {
+		"container": "div",
+		"button": "a", // We really want to use buttons here, but Firefox and IE ignore the
+		                 // click on the Flash element in the button (but not mouse[in|out]).
+		"liner": "span",
+		"collection": {
+			"container": "div",
+			"button": "a",
+			"liner": "span"
+		}
+	}
+};
+
+// Alias to match the other plug-ins
+TableTools.defaults = TableTools.DEFAULTS;
+
+
+/**
+ * Name of this class
+ *  @constant CLASS
+ *  @type	 String
+ *  @default  TableTools
+ */
+TableTools.prototype.CLASS = "TableTools";
+
+
+/**
+ * TableTools version
+ *  @constant  VERSION
+ *  @type	  String
+ *  @default   See code
+ */
+TableTools.version = "2.2.4";
+
+
+
+// DataTables 1.10 API
+// 
+// This will be extended in a big way in in TableTools 3 to provide API methods
+// such as rows().select() and rows.selected() etc, but for the moment the
+// tabletools() method simply returns the instance.
+
+if ( $.fn.dataTable.Api ) {
+	$.fn.dataTable.Api.register( 'tabletools()', function () {
+		var tt = null;
+
+		if ( this.context.length > 0 ) {
+			tt = TableTools.fnGetInstance( this.context[0].nTable );
+		}
+
+		return tt;
+	} );
+}
+
+
+
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Initialisation
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/*
+ * Register a new feature with DataTables
+ */
+if ( typeof $.fn.dataTable == "function" &&
+	 typeof $.fn.dataTableExt.fnVersionCheck == "function" &&
+	 $.fn.dataTableExt.fnVersionCheck('1.9.0') )
+{
+	$.fn.dataTableExt.aoFeatures.push( {
+		"fnInit": function( oDTSettings ) {
+			var init = oDTSettings.oInit;
+			var opts = init ?
+				init.tableTools || init.oTableTools || {} :
+				{};
+
+			return new TableTools( oDTSettings.oInstance, opts ).dom.container;
+		},
+		"cFeature": "T",
+		"sFeature": "TableTools"
+	} );
+}
+else
+{
+	alert( "Warning: TableTools requires DataTables 1.9.0 or newer - www.datatables.net/download");
+}
+
+$.fn.DataTable.TableTools = TableTools;
+
+})(jQuery, window, document);
+
+/*
+ * Register a new feature with DataTables
+ */
+if ( typeof $.fn.dataTable == "function" &&
+	 typeof $.fn.dataTableExt.fnVersionCheck == "function" &&
+	 $.fn.dataTableExt.fnVersionCheck('1.9.0') )
+{
+	$.fn.dataTableExt.aoFeatures.push( {
+		"fnInit": function( oDTSettings ) {
+			var oOpts = typeof oDTSettings.oInit.oTableTools != 'undefined' ?
+				oDTSettings.oInit.oTableTools : {};
+
+			var oTT = new TableTools( oDTSettings.oInstance, oOpts );
+			TableTools._aInstances.push( oTT );
+
+			return oTT.dom.container;
+		},
+		"cFeature": "T",
+		"sFeature": "TableTools"
+	} );
+}
+else
+{
+	alert( "Warning: TableTools 2 requires DataTables 1.9.0 or newer - www.datatables.net/download");
+}
+
+
+$.fn.dataTable.TableTools = TableTools;
+$.fn.DataTable.TableTools = TableTools;
+
+
+return TableTools;
+}; // /factory
+
+
+// Define as an AMD module if possible
+if ( typeof define === 'function' && define.amd ) {
+	define( ['jquery', 'datatables'], factory );
+}
+else if ( typeof exports === 'object' ) {
+    // Node/CommonJS
+    factory( require('jquery'), require('datatables') );
+}
+else if ( jQuery && !jQuery.fn.dataTable.TableTools ) {
+	// Otherwise simply initialise as normal, stopping multiple evaluation
+	factory( jQuery, jQuery.fn.dataTable );
+}
+
+
+})(window, document);
+
diff --git a/public/assets/plugins/datatables/extensions/TableTools/js/dataTables.tableTools.min.js b/public/assets/plugins/datatables/extensions/TableTools/js/dataTables.tableTools.min.js
new file mode 100644
index 00000000..e8c87056
--- /dev/null
+++ b/public/assets/plugins/datatables/extensions/TableTools/js/dataTables.tableTools.min.js
@@ -0,0 +1,70 @@
+/*!
+ TableTools 2.2.4
+ 2009-2015 SpryMedia Ltd - datatables.net/license
+
+ ZeroClipboard 1.0.4
+ Author: Joseph Huckaby - MIT licensed
+*/
+var TableTools;
+(function(n,k,q){var p=function(m,p){var g={version:"1.0.4-TableTools2",clients:{},moviePath:"",nextId:1,$:function(a){"string"==typeof a&&(a=k.getElementById(a));a.addClass||(a.hide=function(){this.style.display="none"},a.show=function(){this.style.display=""},a.addClass=function(a){this.removeClass(a);this.className+=" "+a},a.removeClass=function(a){this.className=this.className.replace(RegExp("\\s*"+a+"\\s*")," ").replace(/^\s+/,"").replace(/\s+$/,"")},a.hasClass=function(a){return!!this.className.match(RegExp("\\s*"+a+
+"\\s*"))});return a},setMoviePath:function(a){this.moviePath=a},dispatch:function(a,b,c){(a=this.clients[a])&&a.receiveEvent(b,c)},register:function(a,b){this.clients[a]=b},getDOMObjectPosition:function(a){var b={left:0,top:0,width:a.width?a.width:a.offsetWidth,height:a.height?a.height:a.offsetHeight};""!==a.style.width&&(b.width=a.style.width.replace("px",""));""!==a.style.height&&(b.height=a.style.height.replace("px",""));for(;a;)b.left+=a.offsetLeft,b.top+=a.offsetTop,a=a.offsetParent;return b},
+Client:function(a){this.handlers={};this.id=g.nextId++;this.movieId="ZeroClipboard_TableToolsMovie_"+this.id;g.register(this.id,this);a&&this.glue(a)}};g.Client.prototype={id:0,ready:!1,movie:null,clipText:"",fileName:"",action:"copy",handCursorEnabled:!0,cssEffects:!0,handlers:null,sized:!1,glue:function(a,b){this.domElement=g.$(a);var c=99;this.domElement.style.zIndex&&(c=parseInt(this.domElement.style.zIndex,10)+1);var d=g.getDOMObjectPosition(this.domElement);this.div=k.createElement("div");var f=
+this.div.style;f.position="absolute";f.left="0px";f.top="0px";f.width=d.width+"px";f.height=d.height+"px";f.zIndex=c;"undefined"!=typeof b&&""!==b&&(this.div.title=b);0!==d.width&&0!==d.height&&(this.sized=!0);this.domElement&&(this.domElement.appendChild(this.div),this.div.innerHTML=this.getHTML(d.width,d.height).replace(/&/g,"&"))},positionElement:function(){var a=g.getDOMObjectPosition(this.domElement),b=this.div.style;b.position="absolute";b.width=a.width+"px";b.height=a.height+"px";0!==a.width&&
+0!==a.height&&(this.sized=!0,b=this.div.childNodes[0],b.width=a.width,b.height=a.height)},getHTML:function(a,b){var c="",d="id="+this.id+"&width="+a+"&height="+b;if(navigator.userAgent.match(/MSIE/))var f=location.href.match(/^https/i)?"https://":"http://",c=c+('');else c+='';return c},hide:function(){this.div&&(this.div.style.left="-2000px")},show:function(){this.reposition()},destroy:function(){if(this.domElement&&this.div){this.hide();this.div.innerHTML="";var a=k.getElementsByTagName("body")[0];try{a.removeChild(this.div)}catch(b){}this.div=this.domElement=null}},reposition:function(a){a&&((this.domElement=g.$(a))||this.hide());if(this.domElement&&this.div){var a=g.getDOMObjectPosition(this.domElement),b=this.div.style;b.left=""+a.left+
+"px";b.top=""+a.top+"px"}},clearText:function(){this.clipText="";this.ready&&this.movie.clearText()},appendText:function(a){this.clipText+=a;this.ready&&this.movie.appendText(a)},setText:function(a){this.clipText=a;this.ready&&this.movie.setText(a)},setCharSet:function(a){this.charSet=a;this.ready&&this.movie.setCharSet(a)},setBomInc:function(a){this.incBom=a;this.ready&&this.movie.setBomInc(a)},setFileName:function(a){this.fileName=a;this.ready&&this.movie.setFileName(a)},setAction:function(a){this.action=
+a;this.ready&&this.movie.setAction(a)},addEventListener:function(a,b){a=a.toString().toLowerCase().replace(/^on/,"");this.handlers[a]||(this.handlers[a]=[]);this.handlers[a].push(b)},setHandCursor:function(a){this.handCursorEnabled=a;this.ready&&this.movie.setHandCursor(a)},setCSSEffects:function(a){this.cssEffects=!!a},receiveEvent:function(a,b){var c,a=a.toString().toLowerCase().replace(/^on/,"");switch(a){case "load":this.movie=k.getElementById(this.movieId);if(!this.movie){c=this;setTimeout(function(){c.receiveEvent("load",
+null)},1);return}if(!this.ready&&navigator.userAgent.match(/Firefox/)&&navigator.userAgent.match(/Windows/)){c=this;setTimeout(function(){c.receiveEvent("load",null)},100);this.ready=!0;return}this.ready=!0;this.movie.clearText();this.movie.appendText(this.clipText);this.movie.setFileName(this.fileName);this.movie.setAction(this.action);this.movie.setCharSet(this.charSet);this.movie.setBomInc(this.incBom);this.movie.setHandCursor(this.handCursorEnabled);break;case "mouseover":this.domElement&&this.cssEffects&&
+this.recoverActive&&this.domElement.addClass("active");break;case "mouseout":this.domElement&&this.cssEffects&&(this.recoverActive=!1,this.domElement.hasClass("active")&&(this.domElement.removeClass("active"),this.recoverActive=!0));break;case "mousedown":this.domElement&&this.cssEffects&&this.domElement.addClass("active");break;case "mouseup":this.domElement&&this.cssEffects&&(this.domElement.removeClass("active"),this.recoverActive=!1)}if(this.handlers[a])for(var d=0,f=this.handlers[a].length;d<
+f;d++){var e=this.handlers[a][d];if("function"==typeof e)e(this,b);else if("object"==typeof e&&2==e.length)e[0][e[1]](this,b);else if("string"==typeof e)n[e](this,b)}}};n.ZeroClipboard_TableTools=g;var e=jQuery;TableTools=function(a,b){!this instanceof TableTools&&alert("Warning: TableTools must be initialised with the keyword 'new'");this.s={that:this,dt:e.fn.dataTable.Api?(new e.fn.dataTable.Api(a)).settings()[0]:a.fnSettings(),print:{saveStart:-1,saveLength:-1,saveScroll:-1,funcEnd:function(){}},
+buttonCounter:0,select:{type:"",selected:[],preRowSelect:null,postSelected:null,postDeselected:null,all:!1,selectedClass:""},custom:{},swfPath:"",buttonSet:[],master:!1,tags:{}};this.dom={container:null,table:null,print:{hidden:[],message:null},collection:{collection:null,background:null}};this.classes=e.extend(!0,{},TableTools.classes);this.s.dt.bJUI&&e.extend(!0,this.classes,TableTools.classes_themeroller);this.fnSettings=function(){return this.s};"undefined"==typeof b&&(b={});TableTools._aInstances.push(this);
+this._fnConstruct(b);return this};TableTools.prototype={fnGetSelected:function(a){var b=[],c=this.s.dt.aoData,d=this.s.dt.aiDisplay,f;if(a){a=0;for(f=d.length;a"¡".toString().length?b.replace(/[^a-zA-Z0-9_\u00A1-\uFFFF\.,\-_ !\(\)]/g,""):b.replace(/[^a-zA-Z0-9_\.,\-_ !\(\)]/g,"")},fnCalcColRatios:function(a){var b=this.s.dt.aoColumns,a=this._fnColumnTargets(a.mColumns),c=[],d=0,f=0,e,i;e=0;for(i=a.length;e").addClass(this.classes.print.info).html(a).appendTo("body");setTimeout(function(){c.fadeOut("normal",function(){c.remove()})},b)},fnContainer:function(){return this.dom.container},_fnConstruct:function(a){var b=this;this._fnCustomiseSettings(a);this.dom.container=k.createElement(this.s.tags.container);this.dom.container.className=this.classes.container;
+"none"!=this.s.select.type&&this._fnRowSelectConfig();this._fnButtonDefinations(this.s.buttonSet,this.dom.container);this.s.dt.aoDestroyCallback.push({sName:"TableTools",fn:function(){e(b.s.dt.nTBody).off("click.DTTT_Select",b.s.custom.sRowSelector).off("mousedown.DTTT_Select","tr").off("mouseup.DTTT_Select","tr");e(b.dom.container).empty();var a=e.inArray(b,TableTools._aInstances);-1!==a&&TableTools._aInstances.splice(a,1)}})},_fnCustomiseSettings:function(a){"undefined"==typeof this.s.dt._TableToolsInit&&
+(this.s.master=!0,this.s.dt._TableToolsInit=!0);this.dom.table=this.s.dt.nTable;this.s.custom=e.extend({},TableTools.DEFAULTS,a);this.s.swfPath=this.s.custom.sSwfPath;"undefined"!=typeof g&&(g.moviePath=this.s.swfPath);this.s.select.type=this.s.custom.sRowSelect;this.s.select.preRowSelect=this.s.custom.fnPreRowSelect;this.s.select.postSelected=this.s.custom.fnRowSelected;this.s.select.postDeselected=this.s.custom.fnRowDeselected;this.s.custom.sSelectedClass&&(this.classes.select.row=this.s.custom.sSelectedClass);
+this.s.tags=this.s.custom.oTags;this.s.buttonSet=this.s.custom.aButtons},_fnButtonDefinations:function(a,b){for(var c,d=0,f=a.length;dh?i:h)+"px";l.style.width=(o>g?o:g)+"px";l.className=this.classes.collection.background;e(l).css("opacity",0);k.body.appendChild(l);k.body.appendChild(f);i=e(f).outerWidth();o=e(f).outerHeight();j+i>g&&(f.style.left=g-i+"px");d+o>h&&(f.style.top=d-o-e(a).outerHeight()+"px");this.dom.collection.collection=f;this.dom.collection.background=l;setTimeout(function(){e(f).animate({opacity:1},500);e(l).animate({opacity:0.25},
+500)},10);this.fnResizeButtons();e(l).click(function(){c._fnCollectionHide.call(c,null,null)})},_fnCollectionHide:function(a,b){!(null!==b&&"collection"==b.sExtends)&&null!==this.dom.collection.collection&&(e(this.dom.collection.collection).animate({opacity:0},500,function(){this.style.display="none"}),e(this.dom.collection.background).animate({opacity:0},500,function(){this.parentNode.removeChild(this)}),this.dom.collection.collection=null,this.dom.collection.background=null)},_fnRowSelectConfig:function(){if(this.s.master){var a=
+this,b=this.s.dt;e(b.nTable).addClass(this.classes.select.table);"os"===this.s.select.type&&(e(b.nTBody).on("mousedown.DTTT_Select","tr",function(a){if(a.shiftKey)e(b.nTBody).css("-moz-user-select","none").one("selectstart.DTTT_Select","tr",function(){return!1})}),e(b.nTBody).on("mouseup.DTTT_Select","tr",function(){e(b.nTBody).css("-moz-user-select","")}));e(b.nTBody).on("click.DTTT_Select",this.s.custom.sRowSelector,function(c){var d=this.nodeName.toLowerCase()==="tr"?this:e(this).parents("tr")[0],
+f=a.s.select,j=a.s.dt.oInstance.fnGetPosition(d);if(d.parentNode==b.nTBody&&b.oInstance.fnGetData(d)!==null){if(f.type=="os")if(c.ctrlKey||c.metaKey)a.fnIsSelected(d)?a._fnRowDeselect(d,c):a._fnRowSelect(d,c);else if(c.shiftKey){var i=a.s.dt.aiDisplay.slice(),h=e.inArray(f.lastRow,i),o=e.inArray(j,i);if(a.fnGetSelected().length===0||h===-1)i.splice(e.inArray(j,i)+1,i.length);else{if(h>o)var g=o,o=h,h=g;i.splice(o+1,i.length);i.splice(0,h)}if(a.fnIsSelected(d)){i.splice(e.inArray(j,i),1);a._fnRowDeselect(i,
+c)}else a._fnRowSelect(i,c)}else if(a.fnIsSelected(d)&&a.fnGetSelected().length===1)a._fnRowDeselect(d,c);else{a.fnSelectNone();a._fnRowSelect(d,c)}else if(a.fnIsSelected(d))a._fnRowDeselect(d,c);else if(f.type=="single"){a.fnSelectNone();a._fnRowSelect(d,c)}else f.type=="multi"&&a._fnRowSelect(d,c);f.lastRow=j}});b.oApi._fnCallbackReg(b,"aoRowCreatedCallback",function(c,d,f){b.aoData[f]._DTTT_selected&&e(c).addClass(a.classes.select.row)},"TableTools-SelectAll")}},_fnRowSelect:function(a,b){var c=
+this._fnSelectData(a),d=[],f,j;f=0;for(j=c.length;f/g,"").replace(/^\s+|\s+$/g,""),h=this._fnHtmlDecode(h),j.push(this._fnBoundData(h,a.sFieldBoundary,l)));i.push(j.join(a.sFieldSeperator))}d=!0;var m;f=this.fnGetSelectedIndexes();m=(d="none"!==this.s.select.type&&d&&0!==f.length)?f:p.Api?(new p.Api(g)).rows(a.oSelectorOpts).indexes().flatten().toArray():g.oInstance.$("tr",a.oSelectorOpts).map(function(a,b){return g.oInstance.fnGetPosition(b)}).get();
+d=0;for(f=m.length;d]+)).*?>/gi,"$1$2$3"),h=h.replace(/<.*?>/g,"")):h+="",h=h.replace(/^\s+/,"").replace(/\s+$/,""),h=this._fnHtmlDecode(h),j.push(this._fnBoundData(h,a.sFieldBoundary,l)));i.push(j.join(a.sFieldSeperator));a.bOpenRows&&
+(b=e.grep(g.aoOpenRows,function(a){return a.nParent===k}),1===b.length&&(h=this._fnBoundData(e("td",b[0].nTr).html(),a.sFieldBoundary,l),i.push(h)))}if(a.bFooter&&null!==g.nTFoot){j=[];b=0;for(c=g.aoColumns.length;b/g,""),h=this._fnHtmlDecode(h),j.push(this._fnBoundData(h,a.sFieldBoundary,l)));i.push(j.join(a.sFieldSeperator))}return i.join(this._fnNewline(a))},_fnBoundData:function(a,b,c){return""===
+b?a:b+a.replace(c,b+b)+b},_fnChunkData:function(a,b){for(var c=[],d=a.length,f=0;f").addClass(this.classes.print.message).html(a.sMessage).prependTo("body");this.s.print.saveScroll=e(n).scrollTop();n.scrollTo(0,0);e(k).bind("keydown.DTTT",function(a){if(a.keyCode==27){a.preventDefault();b._fnPrintEnd.call(b,a)}})},_fnPrintEnd:function(){var a=this.s.dt,b=this.s.print;this._fnPrintShowNodes();if(""!==a.oScroll.sX||""!==a.oScroll.sY)e(this.s.dt.nTable).unbind("draw.DTTT_Print"),
+this._fnPrintScrollEnd();n.scrollTo(0,b.saveScroll);e("div."+this.classes.print.message).remove();e(k.body).removeClass("DTTT_Print");a._iDisplayStart=b.saveStart;a._iDisplayLength=b.saveLength;a.oApi._fnCalculateEnd&&a.oApi._fnCalculateEnd(a);a.oApi._fnDraw(a);e(k).unbind("keydown.DTTT")},_fnPrintScrollStart:function(){var a=this.s.dt;a.nScrollHead.getElementsByTagName("div")[0].getElementsByTagName("table");var b=a.nTable.parentNode,c;c=a.nTable.getElementsByTagName("thead");0Table copied
    Copied "+a+" row"+(1==a?"":"s")+" to the clipboard.
    ",1500)}}),pdf:e.extend({},TableTools.buttonBase,{sAction:"flash_pdf",sNewLine:"\n",sFileName:"*.pdf",sButtonClass:"DTTT_button_pdf",sButtonText:"PDF",sPdfOrientation:"portrait",sPdfSize:"A4",sPdfMessage:"",fnClick:function(a,b,c){this.fnSetText(c,"title:"+this.fnGetTitle(b)+"\nmessage:"+b.sPdfMessage+"\ncolWidth:"+this.fnCalcColRatios(b)+
+"\norientation:"+b.sPdfOrientation+"\nsize:"+b.sPdfSize+"\n--/TableToolsOpts--\n"+this.fnGetTableData(b))}}),print:e.extend({},TableTools.buttonBase,{sInfo:"
    Print view
    Please use your browser's print function to print this table. Press escape when finished.
    ",sMessage:null,bShowAll:!0,sToolTip:"View print view",sButtonClass:"DTTT_button_print",sButtonText:"Print",fnClick:function(a,b){this.fnPrint(!0,b)}}),text:e.extend({},TableTools.buttonBase),select:e.extend({},TableTools.buttonBase,
+{sButtonText:"Select button",fnSelect:function(a){0!==this.fnGetSelected().length?e(a).removeClass(this.classes.buttons.disabled):e(a).addClass(this.classes.buttons.disabled)},fnInit:function(a){e(a).addClass(this.classes.buttons.disabled)}}),select_single:e.extend({},TableTools.buttonBase,{sButtonText:"Select button",fnSelect:function(a){1==this.fnGetSelected().length?e(a).removeClass(this.classes.buttons.disabled):e(a).addClass(this.classes.buttons.disabled)},fnInit:function(a){e(a).addClass(this.classes.buttons.disabled)}}),
+select_all:e.extend({},TableTools.buttonBase,{sButtonText:"Select all",fnClick:function(){this.fnSelectAll()},fnSelect:function(a){this.fnGetSelected().length==this.s.dt.fnRecordsDisplay()?e(a).addClass(this.classes.buttons.disabled):e(a).removeClass(this.classes.buttons.disabled)}}),select_none:e.extend({},TableTools.buttonBase,{sButtonText:"Deselect all",fnClick:function(){this.fnSelectNone()},fnSelect:function(a){0!==this.fnGetSelected().length?e(a).removeClass(this.classes.buttons.disabled):e(a).addClass(this.classes.buttons.disabled)},
+fnInit:function(a){e(a).addClass(this.classes.buttons.disabled)}}),ajax:e.extend({},TableTools.buttonBase,{sAjaxUrl:"/xhr.php",sButtonText:"Ajax button",fnClick:function(a,b){var c=this.fnGetTableData(b);e.ajax({url:b.sAjaxUrl,data:[{name:"tableData",value:c}],success:b.fnAjaxComplete,dataType:"json",type:"POST",cache:!1,error:function(){alert("Error detected when sending table data to server")}})},fnAjaxComplete:function(){alert("Ajax complete")}}),div:e.extend({},TableTools.buttonBase,{sAction:"div",
+sTag:"div",sButtonClass:"DTTT_nonbutton",sButtonText:"Text button"}),collection:e.extend({},TableTools.buttonBase,{sAction:"collection",sButtonClass:"DTTT_button_collection",sButtonText:"Collection",fnClick:function(a,b){this._fnCollectionShow(a,b)}})};TableTools.buttons=TableTools.BUTTONS;TableTools.classes={container:"DTTT_container",buttons:{normal:"DTTT_button",disabled:"DTTT_disabled"},collection:{container:"DTTT_collection",background:"DTTT_collection_background",buttons:{normal:"DTTT_button",
+disabled:"DTTT_disabled"}},select:{table:"DTTT_selectable",row:"DTTT_selected selected"},print:{body:"DTTT_Print",info:"DTTT_print_info",message:"DTTT_PrintMessage"}};TableTools.classes_themeroller={container:"DTTT_container ui-buttonset ui-buttonset-multi",buttons:{normal:"DTTT_button ui-button ui-state-default"},collection:{container:"DTTT_collection ui-buttonset ui-buttonset-multi"}};TableTools.DEFAULTS={sSwfPath:"../swf/copy_csv_xls_pdf.swf",sRowSelect:"none",sRowSelector:"tr",sSelectedClass:null,
+fnPreRowSelect:null,fnRowSelected:null,fnRowDeselected:null,aButtons:["copy","csv","xls","pdf","print"],oTags:{container:"div",button:"a",liner:"span",collection:{container:"div",button:"a",liner:"span"}}};TableTools.defaults=TableTools.DEFAULTS;TableTools.prototype.CLASS="TableTools";TableTools.version="2.2.4";e.fn.dataTable.Api&&e.fn.dataTable.Api.register("tabletools()",function(){var a=null;05xGClFvT5MU!W&$^JmdX&}|XGlY=uhW`PC-0=)^_HnhA-|5(nKa1SmYwaND
z&X!8s+uOzM>qXbwEKT3OeY;eiDb37Gp~jTI>jc`)l;dB%HWxXlGGF(sZeY1ip7UDE
z?FDzQUF&-_^bbzEJQ=YyNhs(h`rH?AnN3ghaq?-F@;tr_@2L}hw)dW^w!oQgQ
z-J|Q+1B874m-Ve>r2eWtXP#TJt!~TJJcIl=Vx$P+DyFA(*fhzJA`#yFoFD?}KRqID
zxt5WRYExueyr9WNK1q$hvz$$O&vk94Imrdj({@v_UN5k0U%9s%un5hZST+;u7?$6)
zwOy&v^{jv;4Y#voNUdHFxQ?u&?i$+(k}b^6YuU7H_7DSAzv-%eEL>+f2$80Z%
z@v6J+(1=>^Cj9_AD%;>=19jPoYcOT;*+OOQWo>Cq@ei?nUHx4@U>&)^^d1&t7ba8a
z-`%dd9nEsoWmhwpx8#_v=(%p7+8=netMSIc9r#kc^@{0%U>O(tM^7`{7Axv*r?k+x
zUYaSFZrgDMo%t!p6g|ooGs0^jC{4elD7;sZdjhm
z3}*hQPvlKc>$WZ3S6Xb-a1p797-Z~*}`gJGSrp&dSmfr{mJ5ErBAM}^}%ZW=|edt*H>k%`_hwz
zwMCJaPKolch5Jh#J1?}~ry}p%Sf%K&Aj1#DV`egsIXaUo^_A7-MRdeFKhZVJg|)Wj
z=Pd^}gz~&==1;V79)*q@L&FVR$gbyHt#Kd6J;U_
zcgGoD<@ZJf%eD{SyQfYungH#%#
z(g>ACDV(Bkn!*_h;}p(PI7i_;g-Lke{Ys}vql;W32<
z1&n!}!V?NlDLkX_E2{pQ!V5aoq@Yn~QF)U>o5HKJpxB^v(6>XurKv6zeoIABXB~7bQ&PRQISM1sXq77ARads5{V>|QldXZ4^UZ2lH{mDNCH45L?-yw
zOXMIO0T~>JA&c+JRB8a}F~|Xt27%BaAo4H}Wdw*i3M4fKBz+1<2EVbgXMhZh1Ie8Q
zGI$Qi(0L%kxYP(x5y&V;BP)rp{0%}$K~*!&PYTzXO5xLd{ep;~a2%ZMgNftd=Y3E-
z4i@@g62bJpAuKOxkK_s#mq?Xq>^(ygmi>
zFCd~O$Ye8b-oXFO`j;X?CD3kd+(x2)n`<;@&96f9O#O}!Gk53V13fn{e4xLcPkf-~
z=S5D}b9_UBxe%H;MrfgCnfSolqQ0L3yF
z)3A(q7Fk6AMU{~)Ks$xJ$^%OwADXGXw-J;&vfym`h)pA#Ibt)&W;v@MYpQ$N3<3km
zgra^ImN%*os^m@er+v)KVrY&>S<4h!BU2cgIe@_q5wg#ht)0gLr0X>ympw$z9U|Ac
za;BhE=
zqKi1~n@hef<}P7&_TQNg_6o1x*1m;_gJB*|A1FX=S-Ah_#JiR_`u^ac0QU(Q5^$?i
zxK-(aMBYe0g=TgL?}_~@|AP7o>|gm~JpC9=d-aE~k4D1@Nl|^ieDMCz5NTc9GnWEA
z$$ju;uN=h2Kl3T~C5E=w5^Hq`-oHapdVoj96($Im4{{dqKXB;Xg!}`}E%Ep0wI#Na
zqklR$;7gC-MI~Pj%ZxN9%gxnt^HI6^xZG@%n=<~Mk@L~hrkJFmVg8kU^6PsZk^caS
Gw#hVg)?W(%

literal 0
HcmV?d00001

diff --git a/public/assets/plugins/datatables/extensions/TableTools/swf/copy_csv_xls_pdf.swf b/public/assets/plugins/datatables/extensions/TableTools/swf/copy_csv_xls_pdf.swf
new file mode 100644
index 0000000000000000000000000000000000000000..10f6d950f851157160e6385f5adeaf5be3aafeb0
GIT binary patch
literal 58846
zcmb5Vbx>R17q{EeB8B4a?oMzi#oeW7fk1-0LxFyAcMAk)f#4QgTQqoZm*Q5eXelkc
z@Vj&8&b|NLndIzs)_&G!tu>R$IoUf$?t>mVyE@7Xzvbf~bW6s$re-AydqEFl*UMP*
z5j;Ak@TT_BZ`@`63mcK#yj)llTA7GuBV!N2i{;V4vykxj7~F600@RellJS(4Wo0qK
z2?(a?q>Ax%mHiL9;E%p84^=jMA|%z@nyVw2$~lJ3(1P+EHHENV$ggQ9&}a;6tgfeV$0TIQ
z<3D1^=%4XWF=rCaOzA}$d6~B3k{DfoalNG+2!ws7ft&*={e3Ej19UqEy2+tr#Uyuh
zX!xF!e4&4l5!xmsoHncpQPk>ziU8-1x%jnY>^8nPKF{SBb%9e_^EL|ZnpFPCJ&6hufa(OM|C
z!Pu(bOF<;J=)lsUdxO(1Yup!)$e!U0%m{UIA|$UU04x^gkIwXDLG1CW)%npG_Q|Mx
za5*iYT-qSfg^e*w3{tGU*Tmg-Xi@m1cf;(39`ilJM#K%!mYdHAe{|atK1cd7a&%VH
zoP6Zx?jY7hDuprQv;G1#s8d^ut~
zQ+S9BbPD%;rHSSpJ8#eKOhEBX)Pe7=YL{pS`e*X=
z0ymV+l^p7>9bu#BkF^=y2y~M7x8Ag=a(Y)Vp4HGmwy3l2Bx*#?PtX7p=r0Xxp+(w=
z$)POu_`g7BED5`OffRjir5?kLrn~3M;fCaAIn-w}eCCO;C3uN^C0Z7QzW)*``HUeI
zK3~4TLGwm;6{EtiM|b6?YAg*CA;j6K4->(`L9=3YC4`bc7uQMfa-Bvr`AqZaNQRg9
zRC#yLv)%B&uHv4%5_{$>cYH3M+KhU3Tt2mVxD(`XL36Tma#TzMYd_EQzW64npyhMH
z;uD)+wSy(b*P7PS)Byf?R!97tvW0sIV$;N+B(?8J@-!S+GI1KOXQoa_^h_KW$T1`ASwdq?
z%d6Hd|Fqf%L3Ag1;`H_)8N&|U(Z*t)>`e)@EtFahD4@P{lspxr_qvq
z`cEVB{i^tdI$b_#r2iXqRI4tYhHJ5BbGBUl<>h-QfDp&ALRqzH^RK!UWuy-anRJ*a
zMSt-sGnri2;+yN`VmvKkKA`SLLMzQ9K7vrt8>E~l{K!tz?Okt72IMmf8D|(-JA22K
zrY0u&)4=mFpjSECn65_*gO&Mg5E5m7!=(~)87dyHU!$Kgrq1LSD2uoeXJI9q30-u}
zGt|=hb;Vz_P@{>fMIrL%D3wL*w$3Io+JQyvvTlVOFGJO1-6{*9U63`(0F{9V^y;z1
z%lL0I+0sH~_;*>`*m}vUJj8|-@R3(eUsDU%EoWK9uTM^~w-MpIYgboR3I__ztoEyF~AY}m9e!onB5DND@T@g&rL`W(t0rz#ri
zOAid-B(k5e_Tyl+7h}MG3XV}27KblJBn-C)YrT0oznPthSR6>`G^eKb$rk;YdV>MS
zqR1=*C*gHO>kwre;R6?}h<;vrz{B)X*&`OME|Nt~H;=>g2!IQH12~%HBfB(DMR?qG
z`DdzQm@j5$IGy6lk_uqT9t4C>ZW=LE(uMQ5j4c~%$fDae??uWU5Fq@8pifMe05a|P
zU^C9XMMtAKS8F!aX!S9XhEa9N<@kKJ3V2hg8H&)G~V`J%Rmq6W9uoIS5@>CUf%o>y|
z1JG1FNOAyb&0&piGB@;qp5_~smE)-vM5xA`&guq)pXNv0|0J`uPPbuWuwg^oMGt!w
zvoh^4BaF$JA@P`Z+ed{M(;$|MJ34HGa^6_W*j@R*uTs=3)0tSfnBq877_!|#y>4ziMjK89h)-33ns}Q90m4fIEHj+-f|8L%Qdac){5;{=6*~FF{Dz9{
zC(T~IZ~oyEu&{r{dmtlK7@K0#p4?RWKa3#6upQS7!^>ceR|7gpT<04xLjFsa!1$^qd4D_giL$_1_B{Q
zC=m_EUwVh^$3YnN9E;il(fNfr!kKuo$?9CG@B$c_iXrq2gg0D;XgfJY7?}Y}sMNZ?
zuZPq76U%046ncdx#Knsr*a+apQ*+D)$|-f@Ly0csvayz|th>T=bIK{vdG(cY9H|V8
zL?g%Mx*0?03NfJr(5(SsD6s6;;qXB1hjE-2|WoB
zGxIZetENPc!)nU(ITd<+e7z!zP1p&V8+^S~yPiOi1_=fswI?9?v`(K#p|{!6Hxd^7
zq$u`-I+>zGxqnaBSKlF<0l!0{JxsUfDFw*KTa8+e33#jHt6Y)IK%YCD!c%V3`#H7W
zvQ!_S5GwpL)LeIp=*`mGnAgQM>;#Q49-{R266HyfI&I~nTn2gxP^+2)ltCu<^6TeW
zF$Gzl8@CpHiKoCUS!&%&qBqNL-*~I;>M_~1NX;^PYo&ZyqyFkr?ic&|BoPa}c>YOI
zj21_=>j`M!p-NRPeNrB9Gdjw9DuwJYvx0T3&}SriRzg8mIIT~oJRmmQ=_Qu0@{^#A
zC;KY<_5URpJu9sc>T_e+qA&AQ0f3QO_YLuL$?`B74uVDyJ5feOnex!yCnly0os{Hp
zm~yGU;uGjA->Xad1cDSpb*Z1mAfgz*+uE)GkX)FjF?CZ_qKTmrcV$uLoX+S`8OVFK
zUi?S_aI-m~(IJPB|EiB9wV=8z;Bjf6v2xpFbUb?u*TD;Mi+w4Y{fF27sLwP85O
z*Ypqn1dEbc@5nC{uf%+AABvvy;AWpVd@cSVhx0+2?6tdCR729z8dZLfc3#uG3|Bac
zo9gcBYeU9wHeIb~vO>-Jk9qOo4&%!>4$MT+03S_j)ogCQ;0Nle@U1zG7o=h}*KfLG
zVj{vSKcTn*r{6|h5^GlZ&?J+{(IsV#cSYIrGhuhPCbGU@wYp5G^h0set=CmE!b06B
zKH?bg$6z(kLq&XZd(V})sFuswaG#$3TL7(YK+;c
z$a?{OX}?Uk)p8b&KW2V0wm0uMyje!KzB4eM+i^5=_~n&`$xIe>YTf
zUqCy#QlH{KJyl*+J2t*O{)jXP>sHm{oMXpiCsMpbHyWqD!SjMQg)I@S=N^ON?9^Km+4Zr#H~msRst
z8ENXS$nKBL?ib$8El+;o;RI(A14d&Zpn|j6ui=^V7{e%`LJ-7DqBuBrSp>Vb9}ofAnm<{5G{PKSu`llwYYvBep}~
zFP>aG%31mCwVO4GVvi?kh241tVkc=;+URUs_^X&H760`@t^78-Sn$Zl-*=?`PjF=jqzJ1iFUf{@FGSAV(KZINft#|
z4P(yRrGA|9!)TTh!{jEM4?gl~__>SB8Bg=GEIw)xN`maDU&6+!TGttKjvHfS%6~_*
zbT|Q(kKPpyyX2B(9wpgL=MxQ&#d1m)4!3H=tL`cZLh53ub?@*sSe&1}W<%uDn)Q<*
z#0$alX;Q*)QwQln_S^y+@BlI0RQkA0z=2PTBv-U=DiI|4+ti>*#+nsnDZuwnH8DYSBeuQDt8JP;u4DnMWBAn#q)fm=L=ZQLV!Ug?s{_a%p
zf3Ro|S^W$7Beq^LW7}V{;{L5^i;TpCo2NXCQUlv!_k1JK2GeLvtJDC^r`r*m;!uWo
z{DmwC%>>A4Ch0VMN}6+yVDq$?pO5nzfAcim9sH4lp?6Ix6|ReokN8bBqV`XY%-YMZ
zf+^#z)!T0=f0>%HImvp-{13;f^tr?BkB4tO24u-zx!Q5?8em$zZF`M%u?K9$Hukr#
z#YZSxcQK6%_44zu2}P21P6=Y%B{&rN{p5cT5Sl@2S;esa3-R`#e=Ev|sbPxO_D@lC
zzOPsouMNnkKC$`pjBQ)2RC#y+7V%T0mn>nsim}asG2Tja7#2|})Jqm2#=~s}!$+J0
zm~UHU8RPl=Xn4aLaQl+bpPIhnFf(aIdva#kPWNVzTE(|WJvp`*;$;l+rWw?Q`4D!K
zp56*%auuSS*F;utEABe=wZr+-Rdr2T0~q4n1=F$uV))QBA;k(tAj?G~CT^MXL=5W<
zBeURE4u<&u^yu$4RipVL$E$W;e2@v}cLFP0wqDSyTNql)AYa7ikf+ktxM5h2rMLcd
z1Idwvu~@K5uc9!*^@qCdpPI<3?wSaobj9^D&z0$K=9}Nw-
zDmgL@h({}8K?Vc$6+mMHcvXebgZAiS8E#W}-6`#PSK2Oa^WVXDi=p9H#wlfZ{mkDN
zP)yQY7-rmM;-{4qWG`4kYHOQ5E6P$4g#LTHwdPhmpOFw7=3SI?dm91OjpfJ$sD2YuHjdi8{(YT@v5ovyja|4+Ds+!Ji-{0zVP
zAN=JR#uj{r|9gf-{P3T0HFH1bs#kng)_8_Z-##n*Ji}aE#ZT~5)H96x4Bt>c!=II(
zV9L(_l_ByBU$Z>H+!fEtOC}Eddabj-61VaJ^_FMPNyc+w0ff(exju&Ci9$&lI=McVZ;->26Y&T1FSqxz>yLzW+cax~h*l7?DVQdmb*e?t)%;`^U
z-B*~|p8XEEDCBStC9ATX>umHeiiP4O7N-)s_w*&};7R_KV0R6*$*^8v@Y!(0i_%?w
z4Hr2eEbJi`rl%?>1;?d9E{?tE0j4P?xpczVs1V&cUMuK_zIQcMZ-6~inI>_hyT09F
z*(QH%{HZ0aqf(O7nT3R9s1ykbQPu37LbDBYQ@^55&A$#SUcv`a=Qp!N&uHq}m>;or
zhb`)2D^n{*>xn14g#6?SxtCD={?B{?7FFK(1}F#Maz&yh&4X%&jZ|$3i%|o5oN<*L
z3HyVY#&51})IjJu>#yNLoNC;NxC^-rnXwgA<9s}c979x)3brO5`g)b+x-JEjZk}5&
zc1@;HM23o7!+3tv-ZfNIXJ39E7W_&wdOT3aLFj1(hg{(~{lBO559SMxQLz3uz-_b4
z782Pgb8gahn3t%`@e5nh)hoBgCo7QCTXrx*j6S+cYR=h_owImMheCCC_(uJuQYU0p
z{$9S^2);}RgNmg?1P2M^dbArGdfX@FOR;Z!5`;x@&9y&-1supvp)GtRjG$bNs+x8S
z^En7*z|NOr#S}h>(j-Cw;6m6Y&nI(cYIM4vhPe$X_@c({Y?zybqm_u(^{_y`W4DqpikRzm&0n%bX|F$msGxAP@C`e&HVuj
zX)Ar>fGyT|Iq?{Ga~!Fn?C;Qh2G&)S*fV^Zz!Kf(Ke`@H*G
ziSNxnmfXz3es}yr`*T0p9P-ig_T~)gyV*SPx9_{g>YtJy&fD+_7p#WwyiWI{dEftj
zdi*^poEf~Zr}r*kCE!scDa2*v_5IIxpx+NgynludkJwvRL#{SprFBjsAH6Y?q<;|^
zuHOBp*J3}nfAHwN+hw1X^8ELm~X~+p@6}e6`q)XGq(i+!=%j#E%{49
zKUniuZic(``_Nm2PJ*spl~dA$9B2)jCP}mYg+(RON?-pjmA)R619)2SygQ!_!uKCr{VG#Apau(tu(tzuJ-`-@<{__;Uv0D)CnVz-
zlVO9m2I`q!-saP?U<>=^!o-~kK;9j20HDudJ(E`}`lod5mAdQhE=)ZKW*G5Pi|
z?~3Mle`08#LvJ0wB$}aTT9MoHMOw|DiGg1s<^~pw@}?Zj9=Pdsi$q6`GMHKQyQdn-
z9VI**ACO~HR2lNjV`diL?3y=dY$3bTwoaiigx~hvh!>azQf{;QkKD~+
z{lf>d5~E@Zjc&u`3xv~mTfac)TF1Bfh)?cGyGH{Ww`^S+U5z1JU`#I2s$(||8_dkM
zqwbWwqm%!NphuDo-(5jL*4o_Ofno)o`*Bxfb^g;_IlFHY)n{!_;lE@{T1&--a|J|$
zc@|G-5JYiEa*D;%JtD0Mrxa?mD{8P+t#OZ!`JpFTyl0-VqpOrf+p1vbnI%ygjWzWwt5ZaLRm4d^V{yuxcvLIxeWTW1k3h~Ru8EuVe3}b(#PS~&
zq6X$8F!u3TUyPg*`X&CxOJ>c2S!Wh|<&78bK8~b&o~A%Nz5&}kV2A6_z)#J(GLK;V
zT*U$N_`dv@Pd!xK*?XMDo=3Ux0bkVl(*iMAysQ!U7lKvFk~
z)IKoISSn7&sHCt90wIUm4_DIXtSYujZ5gIBBTnbv{=ji+A!qbuC!)d#Yf@r`O2
zf@>jc8WS5;P7Y~cP?=fIR0C{FKG=gz7hgFH%ldp3imoF`U-@JwqfXC
zU7zqfcvBw!hETzg_oql|hdQ$aDAT;_3Sw~k8hb8Q^unTsla^<0FoEPU!{D!xSuU~l$W7R`!fG8pHUgflQlVKO
z4t^&?U4G1&-8&JCT^ey8hzU`hYOErbB;)-O@&}F?;GbPWw5eeOu3|ZrYDzEV?|bzx
zxwu}FVPeFY$)W&4|DTQiN7{>ojY%gD+C$8oVPC~^s5Lz(DGRyuFFq;&CfFC0aC|=W
zPh*=|`A85~5G(&YSt%Tuo^L+qm$PX`=90laHFQPPA472h^whEDk>^KJJM|RvCpYJgfE~`gr}=FU^*kQz5%YEOq4>PH
z5UFawbe7^P_tx{BIEik-y+ihtcf+0^-#Ei+=(KPnt;&ygr&aZFGv3p1yIQs9<+&m=
z>Sz_?X6{s9ZZXL+HaICdrED&8NdcTPdS=FgJP%MtH4Es3q!3hS?-3Lmg;ggoTL6rq
z1anKDbI}f5QVH0>JhreMxxzlCQab~BE*vS80B|F9dG91s(;V;_Evk=m`RAxurZR+U
zqf`y^RoXS+_s$B2$Zir-%M56d=xHH8nazTB(ZQ#joZa^f->oHg5JT@3MIK37MQm{o
zh_TRGMdVCh&eNPy(s~7zq1BIlKI&M%U?W>|ZOg>2ov%wiW5eoI#*bL3gXSHouH`UoOXCEqO(f&|GB#bey9uwCE
zn-LE8&qXYu6-BwXHc>_0A013DS#%65WEqp@aa*c#O|tin?ftG93Nt~g^pcUec}7tmIQ
zF>YZ020Te^)MhUR>$UgN(dh4<_NUhqoXNRy17gwBs_4fUjay!1+DGnp$c#~r!9ely
z%B`8U_5GE*+_^KbE-rVhTLdO*W-+Qgp~2y$p*Ba-RO}v=Gm1g6Xc|w4e%zN8d)*uVV{Co9(E)^E-J7DXko$y)5WKo7g
zd7vjd+^@J@Qz*vyMS<9$#ucW@2&8A8FbxGNk%=DZR&LmxB16fd
z9Qw?t4Zs4SSsc?T2kU(|9i%OC!X(3$J$?{(Yly9
z|4K)Sa$(G*I#v|Z6jR$Viz=^@9f4A9@~_yp=<_=z30c+F*t-C`koF=0b4&m7`$Y_6
z=2#HwFDaH&EdZ(t^j#XeDOem}-?UR|>!z-ndw_|dzFlm8e|RJKDrHj7w+)|$XS~T0
zIerR{V(`(?FN96|B&Ehfr{tjTgc?Kuz0J!s;fuQUCO$6$lP#-#KJ&pevnrbj&unsKt03S_a6tx$_gO4%iHHDJv7oj_h$rAV{UJMgbG
zv2oURPK=tcwXA_kR>0TQz0gMJ(uCPXNbG=`)C-D=Gb#z0WNGYjp
zX$$GixVmwExY4=@SE?SO4Pp0lhoWe$w*vl3SgUdnXH}{xk$dr-|KM?;aH4_Z7S-tf
zr?|X~#j3PE<7VYtS**aH?hP9QOKu~LiiUV^3=CGN?XbC4O~=v_*jf(t>)$DBk0rzEePm+jFSb3+LJZ>R90
zV={%CopD*Dl<;6%_JAZsk+V*k@({|p1Irq68))n$p=7NQ**x%b1L!-eEqG!{Wqp|l
z56b64OO4d
zJVjvz@IOvqnWOcm7#Et#MMrHPi)}I~aGtPzeEB&k)spJAdYhn1Dbwokc#^h8lYi$N
zm*&p7;n{Ngc?nPRWIN(^^KD^iV4$CQl1UZ4kCS!1&3%$F7f7Qs*LAt;O$TP&VTrIo
zk(Au472IBR{KIj*$CRA8-d|1Kl0R|uLtP4E)`W!lMZyoAfevMbiQ`kK?^w&a)2*G5
z{KBxLjDg^BAw{tdb&lQu#lBY(LPty`v;BPKI=QWggR1BUYYwWxMH*6;(N8cCmtM!d
zYYmpr{EqJgU*6Y_v8JT5LP8<^y>#}Zs?6LKA%{YW1mX?{L+gZ`48cG(Pc21JgTFkVn
zYMLyxV9sx~LHzNm;TI>NY8d)mF6CPxIFd&w+LFG@Sc(8th^tsnebq_pmK)QszHGIM
z87CV!Tp5J~so}nmFw6^gonpG_BNXc3)tfE5=MQPWwMyX~pK6Fa&i}J7*Z9}eMLg}4
zN^+|^TSHP277%bU?u;B4A?7H*PW)IXBP(S1c+O-S`|-?b^mj^}qRUpwx{V4CNQswc
zOCUf&`i2eMq-N1sYyL*TjA0c03jB^j~MsItOUyS@D~Gd`^A|AQk|
zEBZx*bMwt6hAB5wRX0z>k;cWE(K$sXHLCjim3kmoE@X3iQc757NWH%3fXfuL1-mPO
zOCogMQ5NkECk(7W*Ow%P$1`%Bs6-N{5|Eb6f=Qq{AGwiMlR}CqeKp@p4!c6McJr5{
z9U<1^CzOt-r$7v{G6rr8|65OqyV4m4gJmUqru?O+-oB^yVzEvBa7AIijJPn=3SJ+>wn|smnb`5k
z-^|W-*$QNSC{rv_X_N-^nXQ86yueAuocJ>Q0apTS|g@N@@p(iW^+wzz4N+&cWZt
zT&n&LuW>xqHJFqWMzpju9}&)+CH>KokXvX&ob!|zU8|#9*g38Xr+xz=XH%_JJ?(PR
zA7&chl$uGi?!KZwm{H_ybI3CF$5tqf9ra{o(c=KPkcOKN(laOF?clCF7{#5ca!@6$
z^uAt~m$=hzb0jSAivHJIaunQ?#v5yp7taCab`~)GYJ0LHfW_U4M0xRM62ZEJgTnJc
za;jW}=Pv;7L3S)h#?=n>W2B~ZzZuJbm`<6XQt*1pkNu$uu?sz#5e-}}uZz0t#ev`&
z6Wb4}HB)F+HjraQmDAgLfOKUPrDLkhyv(_gSh|x7iqlL!(trICqf@wAFA9bS&U?PV`oLl
z3a&#KN@3P3#3=Bs!*|hQ~}mra#`B;tX9b&91Zwrs)+-N55>*kI@8ZLA-
z_y&!6)HkJtP_8LC+Zdi9f_Gk-Zb531xJ#*XOhClGpko
zwMZirNw};mo~fCD8cs>%qTFhw^!AZ4(P(xpOSM$5ujbqAjZr~n;=nyxVA_}@qEM+;
z@J%bQuPa*ZZ6eNXNu-cE({87+3&AG*x1~kB3Z4i;En*du96)yVQz}TXNmdajk@TV#
zD)eDtkI3F|frM`QP(n9ILho>0zG~nGF3H{8#-jGEo`O@=)L4UV#KhDhRJo=38(qqL
z#_5Sxg5b1?i!&9^CUgTtlsPjxoZcCu7dUeeAx~I(Tc2m+C?u8ST)nr&zRK9~2mgd-
zNkr-+hhQEt<&nw_j#JX$G^2(s2+We2?S=plkIso?M_;$`o!DTWZt6c;itm=NMicAB
z4JztdQ{&%?F38-(-&`kP4>Xrb+UShshX_oQcMV_Rc#9JM)QcKdmr*MT02T$=Ymhm&
zMxq6xPxIVtEKmJ7Q{H%N?C_<7GYV~;f^dHtYC$eP;b>&-6yduHG&P8%P{aS$#*fvb(FV`%hWm(C;;*)8y>EfH#<<9Bwc%*5+Fb9Gid5G@mcwc+sugn$fdb^53GF_L@10(L)#QhR*&ge|P5lu7
zBhA9kzH<()V;O6NZ`u4E;<^zF2_=q$jw#B;B=U}
z(^dW_=JBUp10CR*F}vcm$F3AWLbe&+pxYOgKZ~60UbGY_pK5mE%bJ<#D=M3-`I^pZ
zo)4lFCXEQ?xj<9cKi>|(!d(=$k)>+O7GBv-QBb3cmkZS%GZg;@-`s!M^l;!>Ux!(
zsmQG-iGX(!rL6NW)6!1KXljjXCYd_TCNa@5y!x2)MzQ{?A2B|n+{)$)L`4N2dU3&v
zXobk^UkVxaka)(vW#h69a8p+4*bY0qvizRAprdk7nwVG|7#N_ZvR^K@Vla*Fo-p7B
z)-2-z51PYm1Twrp%A99XoYMY=;8Y)j<(iq9od88&kEEPoBf@d=V~OF#1%~Mq(Yu7*
zdh3X#!%rzRums}Kejbvx&Ckj=mZdrTo^|n%0RRm*=D22tTAYoPL&^av1b{vPHRkZ#
zmj9|tvP}7F9yLVLsoJK2vxQ@8*@ieU61a^)67`OsiJrhZrsvz#!^@yLJCC9;;zIx$
zs(buSrI^%*EqWKP3d
z3HLO^C3H@`JW59gd{&OdKTYey1R93V3UYHDCw5e~S%e>F9<=EuH%mVd{hPUb==Ad|
z8s;`HmLhY&ZA3pR2+>!Cg~E*E*9a-bS>zzlC=IG}LCuMz;ZT$QT&+vVRsm+oWA>@n
ziSWVsu4{h8-k~7z4;~H3)!{T3OJY~DV*EmA6uK=ZG{4_n+4|cQc|eTSv=jMPPQXqn
z`rCjbbuaGBu0|J?96#F8Wu-sD6VZ@?W7DNl=xp{^)^{q$?H3BXAvW*#EFIePEBvs0
zejD`+aS&QFS|OE9{&C)I<+Qgzgn#)OC)TpgchSnT>aNam(drdM|BCtOy5x8fPKl#C
zl+siSaW=8!tbv}$PJbG3zggliZuH9zLK|^C+%0ruLcdS=gdF|RL@z89Ryp^LSBt@eX5a;1$~0--0kcj
z8U5c}2O%eQ$SZr^qa~wDv?P}GES*DaijpZf_jKOXpE-=51_D}D-_*mmZ*4%TOW{_r
zC+i!pHGhx&aT`Y@JX8!}BlW8iD7#`wO=%vEji=0s1xn`YVoe(*%F`8X!9$C40tN!g
zzQ%fYF|mE;;+={B(`aqZ=Az3~RLZw!M?~J;n#U?wEQBYgJE(>IH1HM45
z*cwLjv1+Zgf}q+62uKE_cy{6oaxlvYp&-t4R
zEVxgt<|a-2g9WB{{MVR-jG?)Ugfd~Kco%H2e~YNTmFkeKdotq89UJT2m%hTG$y2FevIxCU7CxN*NOp`nqK19k6Q1ddhHv*&1YY6$r_TsXpxi4VM~MS5D&l%GgR^wrz}gWhjm+1i
z?0B`Ie@@kxL~Rf;AVLvbE)VeP(~8T0Q%?IJ=c`${xcZUuNsplAX3rxvT)NJ_^V*BS
zw>z}_e??O+KZo(mn{9@&D#%yJjwxkH4Ph9?6Hf%3-m_|^U3Lh8Dq;-<38+PgF^*a6A?lNkt|M!9+`-+m`U4(n!i1zL$F
zRGWS{hyUjvos^lm_JE&uynjHSvFS@girM(Pl2x~EOJ17tvA_6>&Z|03e7q{gz3SVd
zTwefr^>?T>bR(-aqu%AsR|h8{YfvHdC1b1iPcfI{kE+}I6^8c9X2e=W?v}XQCQpwW
zz$P@T$&gAMT(!5%t>-b2r_VL<8F>?ZUyCj>zLlIGUXIYRULlG+w
zF%bXX(WE?o`mw!*nk_u1lkm#2DoE-`|Kz6^(r@WacI)(hp-bWi3Y={((xY6SO2q&i
zk8I@hu4MZaxx)*2?6LRX+OE}bEUf=+$u(NWlZ}j0+kQ9mhio5bv5&jt3|JF4@k&wo
z-e8wf2lctQbgbnRa1~zLs#_s#e-L}PvT)W_FN38$%@;{rXte`@G3lzTCZx^XVSVFf
z+d=|FYL>a>d6^V6pL3~tUaa}nyKgvRE7pYHrDOv>aGY5IfcOj|S+(j0cf-kxLw|n_L{|U~ev?0gc3kNq3nYDN&i*~-Mee$csa_=+E
zNYL=6;2=3y-pyoHtCRwNIvIO-CvL%(n^FC-K4jFI)ygDsJh&-(JJ?M9zA?&rjdvZ_
zYNqSoRuupETNphiA(M&G4ga0o-cWlh^@T}|Xer>bdX6-8fHKBLPRo#716Z=G+>p!*
zkaHxZbbHWk1{w-`%y8Wb*DL(k@@N0Pl9}n@Y-OnNYt_Y+nu1ED!+&cJ2zCulU4Oww
zZ~W8F9ap^A?mQf!mYy|fohTZ3H?Fg^UpCgU)O@Ladc5W8HaTU^99BvKrlm}aV+;h+
z`{Frjipq2rG#!FE9)BHQEDd;m{N=GA=)74PQF
z%6pidFOJi;b==$}t)572E`Ci(;2QDmee>(+)oIR1pq41T!B|3e#u7wvkD6n85et
z!U);nyt^Vwt~4D-voyKA1&XU@#?P4gT5Aeb)Gj&yq8M<0a2d;FDf+WVjH29{HaeV{
zp%{M
z71{TrV@hkji>w#nBK;<}pjtPW#m0S;C440?ad4vK_joS#L%!m7ziOmoWx;57gzH13;5-oe~@KI(%$`(vY&*FoIPFn;A@sk
z3E3g(`uKtjiz^4sQMjy+8{PBOkp&;mVPqa4d94Y2ChbXS6-Pe!E7rct4Bk=7+
zC8V4Sk=1Dg;C(|VBI1n<0i)bCYy8?E)mHx=F`>ET&w0j*1kwqrw>n?4z>%v?B-@%<
zj-;mu&Z7GP$1^7B<7(gHEZ#0g!{c&0VLIA*iJUZSB@ey0*1S(AX<9v>Je+TEk=Y6l
zhosgmxwK4oa5wZ?e@@r8cXu$z?*4pIWJuHFXWtqf-VTs+uswc4n%gzInl-j@EbgK%
zF=-eY*-Slo;nM~toi*iz6}DAovET!A)MX=E1fl}|K0kCR=UnIa@Yva-9}^6WekXLCLiDSR>-Hzl#jo#kJBPrw4Yq~7;ibd
zQCSLlk~E|3;>!H^C}=qAlH$&3?h;y^6&*uiu1{Ao#j-NbuqB)wx?p%~Ki3klvS3gy
z#M|X8keFe?CQ#!3p1w;~G5Fg|ahIL1Wmmz;E9~i4zhox*@Eo&b2n7`VJaU9F9)f9x
zC?5PbxAOi#sFj#PS+*|d%dQyGrR9Brpr+2Nj*Q)N_oANeL#-Xk&
zetLY4BHQVNvX8c4LI*Uc>sTUIlO|jo+&-FkFy1oEhz3rWbmKx(&*Y%OBh@r_QWk9y
z6mlZ{W;I^USSO90!{2fn7n!(e`1fIq
zzLse&m$IW(JglbVL^ran~d&#wArAi
zvxv*zO+rXhtO}I_aeu{dbzA(#oDv(sl4Cgqk!KFIU`YLnNhtH9^PwvkymM2jrZ%d
z(k}ByeZacumCG)jwxIR|-aQfb##`iCM}2)Z*P1G|L+7>yskE-DtQEGJ(6)t-IvD)@w@n-faI+^Oh0^2!q`R???Mi(u`
z>;$*D{nB|?^|1~w-m
zz+7W;8NzQN@*|__my9*%pQor^>4RzdNrwTgoY*GIY}N!*%HaI7IG8
zI&6Wjmap=NbC;VP`R*>?N6_)melscxIVX0d2sfTJ?_T?In=O5**ubTMj#JOxXKZdq
zW$MTxxGt8eE||Zp8~nB+gneoW*!2uSN-uIINoq*%!ubc;XwqSKSI=*moZoeKb+K67
zb^Sf#XP7_hXZc&>w@5qc@AkIBm8E5oed-UwH|l-4?f6^`XwxsoYgsI`(f_W&yWQ&a
za&6zO`^Q1|@Im+FL2%Xl;*4Ma{Pl;bQ_QNxK3k{0?ipdx{Kk=dJF`x9YR7
z>J#k@>F5se^u1j_k^fNa(Je
zd*(Pe>G!p{|8IMbjic2*QD~@1cc`b20j9@B)mq2M)d3J|xe7NsB`WL!!9K3#f|2g4d$1n_RMuABTrF%rG!xli+86S
z*N)>AoQ);N#49lKt8TM|tR9tjsCLYE#CL*r(3CzL^kI`$94ik85;J-l
zlT?LaS9frBFhDo86yK=7QFfmFohiz-a{S681e;KprOuz-)9A7zf+SSpv(F==QeaH;
zA)c=IDf1ZTUviUx4)#;Sr8U&8U4M>KR-|i9y0O_2@P$rlqmspC~vV#khh`M+o}{YB}&G
zOI+eL3|8|>owcnDsD({hDqEe#)F*q*=aXk7Rb1|7^R7)NABpPE0w%pbF8P!$U3%4b
zS{WdlYp7oMIW=f&9V}&Nt;8D$u~gQ4m`tC^C~s%15WaRwrp+reah1}t_|;fXHD_Gd
zP*1g#K{%Pew3O)L>gVD*HM8`0ZmFQ6{*8r&cXDN-^O%gYy0XD{VU}8sH(LC{_VNa-
zZNdgCc|GmBmhO{u?pksdg7uy8cU+|P^>uA#<`zn>`HL(6T-?3QfA=i4>$pnjxZXR~
zAKSFHhcB)?r7ZpPH2;08`p5}KhA+aRU`jAoa6-f~ayB3vIU6Y(XaZ;iTI2U1L5ZMP
zP^thX5H9F7h!!LT0)m)8#2`TsHi!#EjbH`LE%`|x$l&#`-{215Dc}Tfg0haeirRx6
zAPN#i(81~8*6?1~J@_7c4WtK1W31wbsLn1)0j`-~pI|BxG2obp6r>bD3i8VvNRM6w
zkVXn23Lv^6K{zXUhoGG}Moc5=An5>$(fa@)gf~P8dpH-&B%%>%n%(?jc{2=n!-{wf
z{|#$_`Gfbsr^p+?KKutj0No7(f(bqnzx#-}8jc=@_CRxk8ok3CVT06<76yDEyP-t{
z!|`GC5i&^OXivxwqyb1j@e598GE9)j0gY%pC_Kp4Kueq+GAIg^1d0Qtfg%UcB7)$!
zuuPZ{Y!UBL0)+dpjJ%Ar3={>3B8xJdIKatnJW)M>>nJ^xP}%@&gfZM5_B+BK@G_83
zQBIK8QG2MNze{e{KQ*631oI-SXV%eI(R=7`00=pF7+e7s6M+s+0pK%k{2yUqJmH7_
zPh3{m^q$f|GN>U`Pt&kRZp51*8PscM=>H!XfDL*dQV8)48NwZI2A6<&!~7#okv7o7
z0Fw9*1UH0;_i#2?KTrlW?7wkAXuwTijS(Awe$+7Z2f7;|LIth^E7n`?2ZWq{z4wF*Wodq`{S^-`=e`w23R9v96TPu1ztv?
zAj>iPW)1kocPd{8FJ(tn;$$}u1cF#Vq#$90GMs94%e=~O0ayDtC%@2qy#7lsW`H2*
z|G|=v%g7q)tH}?i$m_VPxIO4lbSQZMFG3nF4S$58gYm`Nwq+t8=+XFaGST5-C;_R5
zIFcxmnpbFaNOY)l-YyLzg?FD3VaPYkh;jpqYmTZXjw(oDEN8*XgJE27LkVwz?SZSn
zRT0xb8$cgM2Y?DXeu
z*mdE`k7=L`3T!7`&QpbSMK9_fJx~VeiS~vAAqd}t@q%rT`;o(NAJA@IBP8J0FnX{I
zayar6&I79N4Hp90XuhQFG$vTuc=&%n$C<+m??Ho71iS{tLF&5=7xQ>xo_%3Q5uyMS
zWD_J4peITLQUhuOumRlz#Y4U?-{?`1yRQRcexvnj4X+0^pcdlWLmPnp;9tE0kuaL{
zCVx0ZJ27rM2{v>e4&Lm??+EXQxVN`X(nosB0MOiTQz7oRUm=}zvX`GA?YKB=Xh9bW
z5WlezunJfuVgx)Akpk2K6zjI_>I{VHFWO$uaf2=1`WZ{(UJJq;k?I_1!jHA=_mo20)EME|0c1CL2pWWy(b1#y
z>K;;E@)-W+6UI#wc{iYLw`vn*1q_E99+h9|>!ryPywkcDccbx*sdTN2RJ)xf1
z7`gk%tX^1|-x={}^#V?6Bd{Y9z{}u8a$sZBGZ9=LE&%s}W6jv0_s|9WA7F!xbH($Q6Qn#OD^nk?9?a&1AOm%~c
zuz>r+P9tRC(%~piC=Zl3*a#CiYIc^)M*YqQ&mAL=<5d$N`8)4meh?<8#)8Wl@A@TX
z_}A)ClTP6yD!4hopdre6t_$z!2`{0566d7^osuOs)622dmX
zII&^c6CeMY`@_Q75ZZ7axD{Ym3Hz$)e-k$Q@Z)_S`BgAIh#nCJ2Yv}BfEJG_-3$W0
zcU=Jn=#jn(Sl|ylvLgr(dTfF3bZ`d`M9w4K*{zASFuH>9D730$f=NerP@jU&N>jZWH
zJyF;3R*_c!qiEDnYAAXD@5?HX;GbZRuoy5t5FbE~M28}c^^$bzoXI(U8d{Z0%J-=p
zoKx(-WbG;#vCl1vd@=KMy3cJ!Wv}wBkZLiKG`b{i2;B|ii;~sC1pk8t=anqa!BDaQ
zyc;?M5FQ9uf$0bx+wN5P+)~QRuub#spX0-Le_U{NJ>>E9myCNJoJ(|BYGfZBG;bu0
zpZ>T;?|S&m6JCn_dMaGGDIDnu>o2y9yb(|TTg3k#siHgf+Uce{#@a!rJN6yB@VPBf$$$Q=65M-E%zQ(M;7Zwj
z6kdH1sw*c?-7x%VdbtPURT*IT**>|L)Lm4UN_dj?-{rPiXYvNi(lUJT|432evhWBs
z+#1so)e^Ud5Q+vhUT)BD__P;f<=U$@a_k`oH-?LZeo_e+^zf4K@M`m7SliL=>PhGE
zXFy$I*zv&XQCaS}23#Ko>21Il8~p-i@kuV;F$YuJP#`c6><9{k*exk@fS}~G?ijhx
zqr))vbh={SN`i&KzIcXDuSs~q;Uc|Z&z;5Q3z}+zukL$dgZoYTai8vcGj5oyAKkSZ
zpZwso+KSTqi>Kgc?Hdc3!^MRd*z$-3|VXgD``8!wg{a
zussgkwLcm@xA7+ZQ%6el;5#eE2Z|z@ZL;u)`xnB$l|ew1zh1^G8gP)~;BHHve(n1m;wJkgq~anccbM9bNJ@+SJBC+|5vR7x4Iy7Ky~z=v^rz6O
zt`Z{|+lsIn$YFLZPcLyH(w^2K1h@98Y}w7UcB7{Kz`sWOkCb8390@p+$WZgh)8W2*TwN^Ivffu0_Ul?6!{jX{goNk~~
zbEC0OUZ&T5@W-9*@93mEQ2tZK?~?G@`U9Kjd!rZKp@wyU9V1>$GLj4+Y~QbEL#h8u
zC42HP?~QlrNSTl@M|^rUX9Zh|_vZxj{9l_s`Uf5;!c|c2e^nx4{KLWl3#95?Ya=zB
z)(^q~H0CL|aj_5KEP3c4uLVQeOcO|$@t1*SUD72k$wqc0LXWI;dFu+w
zhWTFu=9Ohy+KYiW%|cBw+4B)7?1R14j!Imv#HVG-T?$NNKAU4$&Ib_D`EU5cLYC>%k&ExJql;~^SI2Ny0kd&m(
zR9mRQ62bh-d%r6k!foEjIgq2MC-iOJVb~w#)M)X?$*SVk>*pHwR_xIBqQwyv#xG5+
zZyPn|WA9zG^)NEOEN9CG3iG^Csmo%7z7^w8cdh@T_KK1^L^w^Q*(_;!If3w-L2%$%
zPn$0bEgpr99ROL|-)G;Dv7i3p%@Nw`oF+MzIEFxmYN0{h={Fpe5#hqVcVxOJQCfbzf{dP#E?+$(B3}RN`UR_VTzNfVGDj%LwPTl$$4;FAR
z+)xU*H2$XkNmnM4Cqh#HIHwR#5{Np!lb-sK|F(R*ISTtbDYbv`pZMV6USu?b>yxi`
z?_qD_aYb?*@|sTX!;02=C4NOSH%{+ek4%H6rvxu1CIqJ?FD3--P4X`3ADJq!)8{xU
zy`rG=*-o0ESoG?-4!g2X)66JU$H2w9g@oR)NSHc6yFg|&p
zi-H-;j?D$sDnzXhUoAkM1ML9k!
z*^P)QpU)DG5r&twN~zduU(gziw2$Q9X$n^-P-)Wlfm{Xe{de%
      8@`pFzHz2+OtE^Rtil&B%1q=L0WM@qw+pdVaWx?jd!w2STUFq4q!_g;~@s3dpF3zPQ>Cm&i7
zEM^aJzx-V0)AQM><0B7lrbduxLaTx$t6H{tu{uz|i*whWzt$h6$}?`PeCLC!_GFISmVt1`3XO?;(dN$N8FBf375Kg4
zIne7*Q9Gj51F!QB?wZ6o`a8W#%
z;RMh)*^jVB%!dx<;qndL{SFilR_ibo__g6IJ;uXlpA#~5TE+c(6f}cXcam#1HAu!&
z%!~~29XZxxCTyeH^-24~^B0Qp}ws^
z;u!~o9IAnzf&pkgfRHX?_<3*6XPFlKl4)sFMCT*m`AP`3SB!Ks&;qcL1RyH*0DTXV
zFj91+zH?-li4DrliUz=>4+n9j05G9NyZO!q*a#toTc`kBl94Tw&@`5N@Ic4>;1y9o
z-ySd8k
zH8vn)Pp#@S^ygPV)$Pad4iw?(WA_i4L@j+Qon@YWFz+3&l$Zo{=$n6O+
zfW6o?u=nsF_+p3&d@)=G#vXbP#va}VU&pcm$T7)5P1QqP2h>MOVo?p|taIRTBvPDi
zoB^)kbZ{-e`RB1*K+-u!Ou=a3^yvNeG3Y8V9o#7BmAFaGj=tph{4=6loMWmblofW72AvUbFw@5KEb^*xtbOiKB
z(rntu(!AP8bR=dl@}W0IB?%ST!%>qx6~c-otFLilIGJ^L+i}pUmSUE^l
z_L^Xi_UEI~lF*wg1iycKPRc+_v`u0rj#I7L$OmkUKZ||C$O@n%B}TGQF#T+;V){8b
zuAAT@ItS&ZG6&}-3rdY}=SM}*@{=NcQIN2R92DTjPppTYt(qdzs5w
zCmlGbm=i!9Y1+}7E)NRt}|f_t@zd4gK3$e
znopRY(IG34t?vD0RMA82!rq-)u(NOz&tp$Jl}EOTTmyT@$>@)ObJIiAJ=E-4Fa*5G
z6OAtr61(XUjV~Ayxmkuo|NcfS`w<2EhkcH1jzf;#=(nJ>HW&PPe^3b9-bw;1&*y7-
z91VLa)bT%|v1U9ns7Q6G&Ua=Urz!!N4?=L4+}%iF0j)$=2F{5g?ytTCMU3^1gdVBI
zasf!7`MR$e(HtWF@yXW2*p6D4BwC5LK2_(`3>DyQEM{x5c_yHNtBdZjo
z8%Bs=kTqL*-H&p^_k~f4u|E+}29CeX(d4{?hG3khTxRQ2VC<(M&82%?l6oB0;-rAK
z*_vM^d)){}HwsFAN8m<#3QStyY&Zm18~vHrud3@AJQ$(WuL$1p!XU3iSS;m
z_Dt8%zuIcy3m=O~EP8uGIJgBF-Fu6gnZ7DmCB~Dm)Wa-VYg95lD6OWjz$vyVn9*V1
zro^&q@`2de)O`QrIW#eC
zXLOpz38VsmYM~JMW_N~2t9_cjIcb-AUa8{Vhs_I09=JNWKu^pjSsovAhZ$?E%X;7W7B
zfpPVp-iFBPJ|z(sQe|L#4ZoJn)8RbVf80Y5;HVZ{tuaLBQjd+s2rYZ*79mD1WH3QyI)
z%Kl!gSN|h!N*9QJy`z1(6FL^^6hcdxcQ1D>)y#|k3K1&6)xCheID`LAn@R*Yp%uzwiSN|7vg8d#)Y*>W6
zTJ{(HuWk|AU&A7#)mq7fu%A^lfDrXSJW&6+Bz%5M4(6CaE_+dT&Im`^VS(*sWFr-u
z;6>aQtMYQry+aA(q#byOfn5o;+eBrAD}TDhP#&GGxF*dN7an8!1KeRB4U>DnDQu*2
zVeJ@z^R?p=ZBSJ2NoC9e%$C_xs}~3{QVdlXS52sf
z5qQyMgfi;A#GqDj<=Xg#_b3|g32!omEu
z0WapJXOBN~a9(I4{?G^3y+{c*SjYt%ESiDm7k+`~7n$KWZMdMy6+AJGLZFxh3wEyI
z-p4{#=VbN1_~;0(-H5f@!w|&{b~2{~LwAOY5BP&hme;mPe>zYi6Be=mjB3pZ82wXb
z_Feb#?Go2eB%=8AnB~$+XZ^i1>q2fCE1HY4!4_)1ZO{WZRgAkAYk0~M&@j7Hp
z{x$L7ws}*J)A7OTH{}Vyvv#o%?7DCdScY5!Uy39EQ0+BTXwgoy9E(DS9*d1%x_a2L
z!bd(={P$4T4Y;NcRy-;-sv5e|U`1UxJ4oVnB;@lO;}saQ7vFOB~XIM;2$n
zrx1VSzN%!T5F1+Tn+S0{go3Xm9McyWu5zddOFy&%S1qW4&3pykwk%a~`qT;;rk^f#
z>KXK?oI*z5Izw4?7R?NE1cEd|Yvnt>C9~f``{slS;Xb{b=WNc2tdp;{frI=8qVnNn
zEk34+zwR`pF3Foo)UX~&$>d$iW;V)m^A@yA`Zd(F@)SzKRlS9rd7_>;CYQ?tNnFT;
z7WNE4u`r5kGTpCAGYBiyZzTiN9ebnK`(3)~LyT70nPpwobL0j?M_s1!{GR)^H4R)&
zYXVj#B}U`ER@kImTs~I#&SUy=-SR1z-Yf#SbDVbk6^o;9)m>#h)m`O0)UQ9TWGo$|
zm8czE>F<0vD`)>Ddlh2lR_@Z=^)u3Pj6lInS=zpuq5W0WoJ(x|D0Z`Zmj^o&P7^H)
zM;T5N@QSMpx5;36aEwA>wd#n_zJTFm`Knsr8v*`H(^0Q%2ET)#CV^iB_=iDp0>cD_
z@`16OMGmoRh8H+pa*274lv^An((-C*3Xq~bQjgG;@LEAypv_&?KJuij7B?Vl#vvOu8pLoZ*
zvaGA)|Dvi@EB-={*VPP+AF_e`Wjo8}&`G};&vaCMkPjr2mn)_LYtFDuGvI}uOEMEd
zbn)b0m8jc)=6?4>TZvO*fBnlsM5j&VTI8PH%4;!Z73&$65_R6gv^q83gS0t?Aj$&z
zEc}Ctmu{_B`o~7Mq`ihRjQx;o+aKYIyuvo=DTfs$%R9@La|r(1*JeG*^75uXTt})Q
zBe-X1!ZX4{`3tZZ(lat)zW1>mH8$52TcKv5F{%;=`ogN$v%@Z_CspH%uR^1(!TRfL
zW*GLoKT7k@k#58}@QpI?Irc7mj;Y?*e5qX?y-j2I`gMfr$s;Oj#Pos3@K3s8V2PMg
zWDIVT>E{-b3r?$9)+A9B<8Cfe=Oo5@1I`$Vw3%`;g@G;C>JqNCX}xI5G;@|Vsx)Jk
zH4oLGOrh1(L{8^OhFqgLRRt^~wK5zIOO~~Fs-HQXTN#vU%O!AYs@199zhz)d5-v~U
zbS_{RhLoR08=A9d@u@dW6gp)qPOk)OI93^b9*)e|_r
z4h`R3F(~D#qYP^DCt-Mq4*M`tyo*;M2}NV^B^Kn^!84dB&5+RI{|y!!$zybuJ>S-v
zb&xeD){4kH#*Uxbv634eRhOC74rI->P2Rj(vK$i}Cb?kO36H3Nhm;mO#G__xV%sv<
z=Xk`M=w=#2dLXNxjA_5UWnWC@93heW?8$!0Vavah?;cOA{(}f5SVKck*3+5t{5mVE
zOkB%6Vk}65OV7yDIkSYiw_-8c<6qViMNoA|>(b0%Z$&V!)SQL6SjY;^Qiwkrdy
zNu9B}Dg)FO1*(adw$%37qo3%yF!bttWYw7T*)oI-D_Wh1dVcrLH2rS-ocA*Z#(u2*
z`hmpDSmXY4lX(!;Eu_LRwcb34>=&d0ICJcB@Mhny?NZXG+gu!Dts%=A>|vq-@?>+_
zQnKAvGJt)K+7ky7lR7YIzR58ZI%nHt9AJA;5}n0QKMUOAG$PW7oH0^cf2CN#$&rH9
zq+`q?%oJIpZXQG6iL`i)8DRvqlYBiS5s=4=^?_!3=3c&_OnsABUem;o!%IDu(I~!s
zv{W-Q-rWAPqT89FSz`1fXD&y=73@7CR&>iu+=R>m!QHJwW^u+HE>EUs1W_H|BA6MI
zY8Fd$>e%}f_vs2Q9U8MbrXE&<2vBUv>ks@a=mCp=%
z%}A?Xv93Ydgf%VAMbbny-B(Ncp@j3Q+k}uBY~7_4L1Oe{r6JZG#@lT}`1|Z(;Zr;m
zfBK29;d=WGoL@;2yjO+KX-i&|-CrK75D>Qel@V|I_SZ7$8CFqoum)k{)~(HH^AD1d
z%xqjMaU1a=gn|-{+}7Ty;jo@$Kc6<~dm*E{Ek&cm;R_9S2-GyQPtt_cJHon&;797b
zNmjM3G@`LVcNi6N*|rABNnSOPZir7XJUDXRm(*_@@LC+cpf)Z4r(fY|Yk$W)<0(}Y
zk0qVDG}K3ZZ~8oJ%AJ)bpZx>$R1HD*2&SaEg(!&W?}0oUd=XR)&Z3m|Jj
zv_20ZI>EZ@$u3cx4`tQi^Ps{GoIUrlT`dJMu8dtsepGPTO+9FxzpkVtZ#(*{xq|R1
z72~_kWTR)g{rUjtu9QMU;700Hf~x)_-6RzuWUcJm`htyla7_ku!k6br7yZZ-&K#UDM$7(Vk)ZlNwXm}aht5a927n)Y_j?T
z^j80f+cZ$W6KFdYe5;s%@R*7B204?7d
za{kbp4Z)L7ICl#FG8~v8)Dk(vr@PloB96t+uZ0`si0Lou+p=yZGgn9JtUk#!nJi>?
zoqQs0b5DO3qC=dF!TA9RWXA3QiR|jHySb3BT7QoX*PrxM*3x;_^N3Tv#GAvEI0{*-XQd
zNp0tIv+j*mR7EozkMEbELx=hr6eDwQdEsqMB+WKG;`pZB^RIG=(G;^R%Kr6%3>LMw
z5VuMEbIOJ`Sc0p&fR*bz0=&*8j$!;5t0Q9>3c2)BnQv*$HL>sb5vINC0hzQ7l%7Pu
zqBjLtlK%&kzkv4x@Pv<~=Y`<4dD`60ODT;ffUjLULaw
z`!`1YIvyb!e(i^CImcVWz6$ogL|*GzGpp4E3{|qS94QyeQM?<_E#e~~kaua+ff`_9vPJlB5k?8^2$uP8@V=XZt&%J^hyMNe+tgANE8}
zb0ME(3Y5RAE8#~ytH%epI;K)?vI<9Kt*(^o$?937e$IuyDMoG=e=^orw5VMzm?Xkpv(r@UT}2XAPci~hImRI+?cq7~
z{HB=^L+#f%d%n{5f6CtX7k+&bRcZ_cQk~4!rwvI34Kl8YL)gd;R3%I>jOMNKw84cj
zUYQhj0*mDzYa7Vdh)o#!;?-|x)J^Lw8js?Jg9eG#f)sSPXQ{IeKX5b|dYV>_DB0$&
zf3-{*kJ||v#FA=YHr6HGbIpTTMROjunQN)n5r@5%Le5t@c3@x;!CW}4oTDi6HKk#i
zM->pbdYixWr;=FIZtE8o>WV0IzHKpb+kr^*BcvPe3-3~wgk
zoW04bsT3vZ37_J-jZAT?}
z0oIFE8l<1`_6YmrEi>^WII5UR|pW6Vov-w;}(8!}$?s-kkOvGrdhvQ?AFHFr$t7Ne$9fima%&
ze4Bi<&^hIAwb!*$y+X6LEsm{Zc_#RMxTm}gEemBZw{+F8KUuL`HD6%3JeJJxrA+U!
zgWA`z#=0b;tc#_2sMpvMtX)B-z}jx
z%(fX=I|DA?)*n3#`G)-!|75vW)!^NG^f2KYb|T(iEx|a@a4~r3m97@P-zkc_xU(m?
z4j1qDDGZEt`STpUBYwqKpHo@+rQ^M(AZkrV>W@S@3=b0ns?q?yNAivnC5JoS20?=b
zdOhlt>M7e#;(h;OIhUnav77a>^-e97u)ZNvFKqgztFL8P8ykBCp<5}?wuoe?n_mz3
zu-5xBGwxz-h*ick*pZf6VywxS(DDHq>`JSQXWCx3gck%;v6kNG2
zIB6x#K*!a!p=Ua^4STOycA(hk+s^P`H(?ecaKE-NXYF|Pb>T+qke!phhQOJt;dLiW
zUmWw#eIw03*SE!0?E`q7!q=nvlyBsneB-qLagzPZ`Dmohg3d%6P%ebq+ObbebP^^KmAzGyZ7}J(9IaLh;$#1EP>K3
z0p_liYxr#-Pqm7<$2zXBfrj@TgN(u4D=yUA
zqYGl=J`VX(%du~cKV6q&^J}(nDOt^B>{F5he`{ia8Lj3$;v-r}>9zR9M=pQt=J8D8
zdh-WB!EXfG{?*1qTtvHob5UCRqr$P~Gl5jR6YpZCKUBVUk}axQfOe6;(w!KuGWsV>
zRNV2eTY&x{h=Ti)aWB+_-Cl~~&|WHX?m%U$Y@QaKq0!J@C+MqXtR;?NM(WfnoXFRst}iS>m=mG{mmdpD5TQb@Zd!TXvptu&8e&}u&*+qGL?H>XN{n*Mjm
zG8n`-^k{mK#$aIY@!hM}MNirH4O)`Bm|0G^3n-r2Eq`&RoVfjm>F9{Ob>-L0six32
zymphfM718rf9K2pInUh*9fam3N^3b3SLzm5f{H6uAx&<+X0NfPBfr?#4;JQP6|}#p
zyM;O2=6wI@Mn6AGK}L(M>xk)H(R564ltkXZbN@y?Bu%{s1Z^=sZhXs5nYenyz{+$a
z$viX~gpXOaX$bjYA43t1?c(%>D!RIMTv{in$-3NScb2h+@lTl~Fx~DtGS&k+Us|ch
zhf)U$GZm`+BxaG+Dr{XyxSagQ1q^Rs_|}W?#5f6p_!PYq{4$)BYgS){bBqqvH)V(L
zvto_Wvq2x&Iv<`jno9e=Md&s@kjt+HN9z)Iq3&X@3T{2&D1pq!mnH?jD$v@F>;8Ig9SB!X_);hl
z3^4SI%YUSrlS4hQGufS<@~1MJFB0ofq2OouXb5L>;=yMy9-0p68MAX5L=LhqGIBqR
zAApF&i)@&8Q}Hh4(#PviiD^-B>4y8-2BUSA?eST#Fb%CZ?6$rh@(N(hkk8IPUUg}a
ziutKbz0LO_Eb>r=#Fij$k5gA~I$CyZDN}rYsSOIa7Nm~Ky=YbIKeT-JgU5(%dNlNv
z;i%JjYnIP&r!MZVUpsMDsiz$44uNcrY;$4RAv&M9s993@3V-N|Z}q)2?U<1bwp#zU
z^lF7ADO4*>{;EXNlDX+G%|f}u*4&nW*OWdb_aFUsEK`5g(WalyA7Y{k;>Lf-73TWv
zRJtwI2P@6A&*M8W_yB*Ezb^eyw=4M;asE3fIjX3%`aTJ3MWd-`k6plsCbXD7bS6Q1
zIYk*sX`S*rwyADV6-CVunZTS(`C7F?4|$*Iah*q>PDNHAnb_$x8O7#V!GiLIfh@V{
zuH8BJo3wh`n(xCoy$!D%$Z7{`=ooDWvPqAIb-%x1W~uk>mC)7#QbQuY*at75p?N(ts<`weMHJlBBRB%`o8te1=`Va
zKEsX9lEps1uyZf1t;`v1<8yLMTHI|prwmj7VJ&@kzG5(SOm*@I-Xi{T
zOmI+HkWpZY%CYfR{I%C4vOz{O-g?2gznEtw?o{hv!YAoPF(idB4BT5xigR}6>ughH$E1jH(B>;ppg;d(Rq9om$M0$9DjV
z=<7|Nh)hI#*{htjW`L&)m)V2N`Yx?@Id@Zlfcv+(t_dwiePMjr;dD(wXdTT_LCL%2
z&P;LxiuAz&wXD94KI+R<$m8dZN9tE_o4KcP*_B}D^4@Hl*>w%6@haiJ4tK)2ae)IO
zT7n&eX^`L~5syP_G!$S*OyCec{zWW(1p43WQIJ6YLsw>&P4&%pkmh1C)!)5Y2uX@l
zab>Br)-XmU?4kVK`V&semouaZ8&>p^{+A`jil}&&Emj^eJDu&WMxSt(5;CxOc-QN_
z^E6el+6(^n4p<(jTayIw<**e^Qw_-Nx)leZqxf26<1%}Oi}0Mi!u;z5O3ZMg4v?)e
zaUrcCO^+rdPq@$2Pnmgx*lNyq>fqqvpLB4`!D*V-wp-W*hg-fcJyw#=
zEq1$d=s%+VrZ%y)cNJc*R)!iQ60oGinqvd2>{Dgv-NYQCAnr4PGugHWx+iAW+Hd&v
zV3^hHleBRtOm2uGLmJjwR?wf2mcpA{1+F))@;`|vbplvJD7#K0+63+ihlNnIB!rqA
zK6BJ{mJHj8{hdi>W$qAq7hx%~PM?P0t?M3mtpyRrBnTCJQ;@@I+c7gB_bM`CC#i6_
z&Yop8%XuI{a~GqsIO%N=l3cK?>^PlF@0w~mf{qYDW=J<3^*hw@#V`f;oQb+jDO-g8gbwmWkeIyoMWsFP=5kR~h+eArA*Ne}7qg&ovV?
z;@YkSR=Q(M;xRF*9bRK5T`LnS&uB4d=3m!Je$3$w2MC)4*1`r#=F8vl74Zl7cp}Ps
zzrFv7hEGR~`~3z?r`|^wUs?K7s@xyVfqF^8hwXsYz3jI+))}FMn@Y|ylqCE0O%WxZ
z>j|?x-mgtLYc)T@=oR};g^BQ#AB9T%*j*+#Yh|<4m7Db|!x3YdUoN_NEXkg6-`T5;HMSC_3oNde*=48
z?~Y1ufN%-U9^sC+U+%Q!N4I
zeLVBdxjX)bY5%|VjIhX$c#=qK2@=KXQ4emHkOJRMW7Y!7;?6@&d9eFOBicrfC>_g
zH7h{nSU;e%15}|Us+9~-H76&H<)lGQcV@HN*R$E0Z1$Jg>@C^sh-~&wPiB?A%oeG%
z%57*Y8_rFb4zyQOMQkFT=>FIpj912nGF}<`E0OntLd5<^AySRlO%!6WhC=ll)Y=WI
z#G}A2&kTHDvCFX*9Joof%k8RxLsddoi-DU}Qh#2M`zyRQZ-rOCPj>AJyV7-jUo%!#
z=vogA7}xG@mphwOzAIU7cOSS>{m;iw(Ag`@LX#Z~7teIV4#;e-Bc7V}uzUD3cZ95G
z5eC@K5*X1Qfe}5|KDVn8Jr}djxv)w_bVsvzmGF${s+nG4`qu*|;%OHJHf!KXNGmmPJVhEX>d4Gibl?#M$EIDqimg)2WU~wIu)~ZDmE`XKXW2m
z{J;lU{QvL=*<F{pW|-5ht>DpUBQWkzH^iyZl6U-HGgu6WK>jWYZ_IpoS+*bI{^`
zC)2{7r
zc*@r@t#o_XS`nsYbiXEj5EM%{bu3i;O*vbmaRI6nyjOZRIelAMly{m|(l!!JjwwH4
z6-OXnnirX>wVEPqx>oy}P(;<9pi2obu5?G=%qetJ8!7c*y0s6jCZH2AV2o3|Cs?yV
z6=agJxU1$ZJUiq-heLE0>NwwZRvF@b<-
z%;VMNW6;j}4;1U(a6UF^tqUi8^j=f4MC}KP!b9JW^qel0w{QpfQYoQ#E$Hx>j`Qdm
zK5?p7z5)qT`5XS7^64y+sW*n}*O;|yOv$4P(syF&v$e`Ayu0o<3pu!K_d5#Gq6pEy
zH!4(ZujWa`yr`uqf?p9K#nsKn<)#vNu(YZ!rQ5p|{uI6`9GnF%7p}8hqzBT$&T^4~
z!E`C$j8hWJM9P__(3>81=?oNgLN>Zim5k1zMck-8s`r|Tk>ZrnhFi$7t+T*e(
z86A^TDZRnsm$OvZnzt)L*>eLzr!y5qEfo~aB{}QOTnXXI=TQPB*GxhmN1CEoML-*C
z?v@4L4CbMha_(06`g58uRwgriQkblJR>+*Uw;ipUEGxV>$#q^y%SerDLw5ucGFc&i
zCGplqg!!S)b~c!NK1VD2(_>rs4wPtNWo(>f(y@h`r`bq4$7(f2mTNYda$=IFGvUgq
zXcvZS&?=vEx*S{3!fyvHJhNf8T1E@AT+_LoIZ5T3TUc<)nX15SLg0PtRoB+zVqw3g
zvcw9^q-I%-DsC&gfJ>a>m1vv23gpH&d~;FUIibq+r)b#!K`T
z3!ud=rT%4+Xr4$?93YAGYl;r)w4-J;T?{d126gO&A7QJNk7cuQ4L+uxrdtwZe@z0s
zCX3WZXfF-UgyFp-@kbrCzsh%+&am1j#U$g!mrVkdi^LX_Y2ZuZ#8!mZ+HAJcT#=91
zVz#2Z3`-Aul8XaIF$%pt;3%D=Cei^`kZq&MDF&yUl)a&Pmx6UJhbAd?M}+ET>fVHa
z+X;>tkhwuZJqj={ikr{cS&7Bb^G}4^euGWRZQ2h!AXjbB_N1F
zYO$)V;j4C@zn1grJI}V2+0-`Z%&kmxT9=iv<_}u*MSd$21E=d&roIF6&T?1rAoBKY
z1SCC`XFKRQF94!;l=f>dkan6(Z<9SBVmRc#qun@vcf~|n2E)K#7r_1Rx-KZP!*&tv
zR?zjL;>-D9BU@2SIqeX;^d@ce(s4(Uw~|h)iz#?I_*E8uDTH^c7V+K)scznC(%wT)
zGE_4~eXH8osygrKwXLe4)5ZF2X3aK}G|a7AK<{_tXx`ENG+S>2HNP6+IwP=3A9!4;
zZh>jJlTF}^&FtvRf7)GnIGx0=@Wu(cyxyVaDLmHM7(YiF2`%I?D~m8|V4
zh&ebH+tCDG8-yBnn9fdf;C*O46*zFJUVlFg60PojQzprVXinK3P9?2}!`>~E*!6Ig
zn!?`ek9OGijR!!+h3fQ*(?y-fJ6u9
zXT#g_ukx%V{rwZ|x=-Y*83s*)C71)7W8NfK-F#Gq`{<0Mxy`Ju_$Jx+RLujXNGw82
z%YKCUu_U;<)w{Mtq1-8Fm+3rcQW-Y>!)R+NANY`Imz(7Scbj(1bruP})%CF1K8_K(
z{`CluxOO5+Y_+lM%pf_OUm>H?*HVw
z?a$FmRc&$!U6`Z;(LQ`0>iI3L)MJ|0W8_!#X)5p2RMDrYvQJaDK27IP+PQt2&O=fa
zXwS#<0*d3!I{YrguNuFL@VgklOYn>1*As-jdN=j%)6@r{z9}9$sg(1$S@Q%L5KNto
zyAA8f@KvJ5<#T)QtOd*A@6q6olk-cbS0z?Q*guN1kWgY>=fCZW-mFQH_gQL}#?4~i
z+uG}STfqtWJ`c4G>nSe9JIcwHM|f{PM61#qFZ<8J%a8Sdm$;}&!%$vVlVJ+1px7-N
z49iu_1cT`aBQA3&ijcygB2@i!Vb#2AVpz|dCGOc=Tp?@L0Y93~LITp~@^O620ruK1
z^A=QwYd!Csc+j21a$Dy&OzrY^JB)QkMTSBVgeqgjUc4WP7~W|(2z!rV7Z=`!6JK45
z%b9kNw9&~%TU#=?A4u!C;;-=A2
z7W;7O#PFl-L2+HQeU6Rx
z*xlONX$Rasr!9B6(d+aVsnb1$I+q-c^XzkZnxtLnUa_lGOnT?qy;v8|x6ile9KMKV
z&hxz;TkECpV!B-v>!wQf`QA=2$O0YhZg(dg#n7-Xwq6b+GhHu0_z<#@o$!+{2?FsT
z(9^Xqp=%X!zFg6hAs0bQV5>9KLhof+nNW*&ef@4liZu$_=slnD;R+b<&KgR)b>02p
zbRj}AhpG`$ICPOqn|Vq5Law8l;YCU7uy?Z}_Lcv2Nw4@Ny)83;HG52n@fR4s*m~de
z(lfNh2t!l+2T6kEuzSU|q+PX?E^Tp`cf{j()tS`cwGy!f`J-aGr+eeFKvlG?rbWjpIN9w)KF@O8|@cql^b8yuWS!7m^f`;08v
z7dQ2@UJu*-{7H7RkgQ_?Dq>54Zc%(xj?Du4K*&dx*jPa?FZie$YZmm5h>vQqKMHzl
zz(@6%E$D>|A2nh>6!eOfkD4(|rPkvC8j5`mXn!9I$9e;MBVZ~LI~V9s)kmYT5YRV+
z)S}pj(4zYSrix=nfd0wHN@C9ddn=%g#U2N`Ibg9gwhidpL26lS1<-c_v^>@Z^mu?)
z#3lfJH$W?6LxEo5W8HYSZHnom=kRXZ!$Cdg@@`uuXzY2s+qNe_t9ZBVy`bRpdAIHT
z0KI^B+l~fk_ngDigB_k8X20|Moyzuj;-l<;`v3lqvOP~`f8X{0fAarh`TvSj*$Yo)
zQTonab}zfC^4=3!*ZRQIF@J9QFn4?FFJ`H#jZk>!ELz>XOQp%Vg#0OkPGJKF>MK|x
z@I2bpQHiE%I!vi?xa#cH>5hq8KU__v?P%?A&%=0^KA-?UDu$eP%#2O$M^i>$FV|KD
zxfYjkwyg?h+sbYSb?@ofN+?@gp&7jKkeBgF$>*tlm)g5_7aSzw-Y!bj>_-@FAor)(
zcWz49{V9ff6Aj#-pPgPy3)Zz2R8M24>FhNrWuHkYln`RRpE9NRwLZ`5J)YNlJO?-E
zBK{4!Px72Xc9=bZ()j*)`X+`0Q
zIVj_VUh!G@sk7i01x(ZW#A{j2ep4owCmI(~xD;6JwNqp1fjK(QM)}oT;&FxeoMu#9
zNPZr_@X0%)d+5cI9M%y#uYh{GQ4!8lgEUB(YAp7&IakkzP|9MyXw}5+;TM`y+-5Xx
zF!^hF9v1uS;5?IyC)11K=|X`Fj#cJfiKY)a@LLdEG{4uS@w>Zx$11}7d99$c^4v{c
zN*x+ufgO>9BOH2fl5rHGP|=(ahAW*G0{nveazSSZOq!Rl0{J
zYFwwr)211wH7b%xT6aW}*64_LDcY@{CEVIsLL_FQHFPgAF+X@QevUZ(RrzEPXbS@0
zcl{gLiECW`eo10PkW}kGZ}y+RbL)H5_K*@Ih3oe2*Q6!>YHOyJ_={id@BQZ=+}?>l
z;y2jkTmLW-m8)4YW!cfgLfgXj)&(YZgTsFIPte`FN%`e>mEdE{>wOS
zufD+RsxGC^s>a+xq_E1g|n
z4UH0-1-(y5U;FUa2#6b!kNY5qYY}vPnAZ7qOJ#anW~iV;pPSqPDf%YR6FT4fj*A2q
z&UAB}zZ1l7#l)}a59!#kFZj`^Ty%t@FY=?)ehJqguE^85@sX6LYjh8Mn8@8<{vV*N
zB5bN!jrXd6_dXwsZ9*jF4H@qp4{sD1{@Wnl3*$ib;8tcJ$lC?IVpPvZSiv1Z7*ubw
zlfU%D-*=+%I8mfBtI?fY>x|`d>TnfazLy@jG@Tf*_>@i?oZq%|EpVim@IJ
zWxTg*ymWdMfF1bDHMO)en>964b*)K}!dDk|%IQ?)Xg*mQEl7($2Ti)H$HI7QKBRux
z`3vLb{K1_m`U(-|4El=E9C}-pp5Enh4xzPo3i^b=WVERMIkWaTQ)+(B+>@$#-lX2E
zIS9ufytE8P)tVZq4|@?JSrZn?7P<=^M6|SYrfOa=`CAh;FM65EbD0p~<)H6j5Y_?_
za2=MQH&6uc;0eBsE|QS9DJ5HJ!Ucb01ii0N><-AJXbG6EdD*1TevK7$0l$M^J={~>
z9PP-PsK72xLZ{v?s>{FcosC~hcYyeFBIp_FA4;V&3HmlwKH52C()RAaL#ErW)46s#
zw9!@vUTdl*rmAcCZH)DFaKk2ZIx^M9c_))z0YRbGOuw6E`On!A`T`Etui%@f5idF!
zp`w!L)ns9}((5K*r3K^VH6AaSOQ>z$t1)eUk?oP(6gVf6hU<`~Gm+qpP-`wHr|C^A
zL6ekg&5ICLQ2TsD9Q0nTNjrO$xI|~juC*XSm>>O;;vHm@RUypFxe$C`iw;j(_jKjl
z=W!9zr=wkqBgwS$qQYNp3ED^zamkOKNP8=F59bTGTvbY=P<99!NyClaiw`)x#N~vRHVYig6^LvvObgVgF48
zl}{11N_3fP?TnCp^ha;TS*Os4?l8pCU51y{;f+xkqjcS2lLOY=5Pk5@weIgSdlbl+
zz9qu_`AY{{H~>`$W!GaJ9J@(h=D(1~w;|e9V$HASK}gt{OIIZPns!7Q
zx2eu#!$%*Y^fvXZ!seX+O5mPu4t!E3jv$VVlcJqvX0-I@ejm8jZa>$<5j&{*k%+&y
z`j+hM(n-G}w7_EgL0Vn0E~oqF0R7>hjOiBAwrK>`5G@BlV$FO-R&-I2NH~VL7o+V4FF$G7%_BbyI{cnvhXZ
zo!M%mf;HeP>^%B!?9dr7e3@?h`4Bii#dVpL_V~qjPn~YP81argX-sYXh{qHL^Ibv}-kXLj
zKlFEEjUcn&74%Z%G*f%l4$RZP>^~1hP}Ew%?|h#v8)}{;XpP=PHE$x7&BA-HTS1}q
z1lEy%y%tU#`}i9OtEF@Ly#ICBFVU~N?%u+=IN)wGuL34>E9(nexfMjOL@+g&1x&tr
zmbMY`HlO%Nq=5M7=`Ffj&}V)Y@Exba3M^u)KZ6oxT-4&-3ZNJFc`ZTL5$Nh%a5D_6
zC|W;-iJ%38;c*%a5j)(YmA+9r$GbVg1*6|zfqzw8OZT!ujQJlFY@rF-C$-IiuX-5W
z(Xq9GM@%No6!QzQ`S_!zcj?2=mqIp=aG7U;>gi*+Awd@-`_Qo$rGajc*A_eEmGW9a
z&7py>n;sn!rg^0e?z}t_F1-}iJYt4Dt@19Z=VWy_H-mGH*&9O6RUJq#A2xwkEgXXn>=FNcSwKHhm2x#64Xx`{b
z<63XS3OR2oJXQ_otswArfrn1M{W}qU_up_{Rq|gCFbcmO;1zegi^h>SA3NoVGpDI@
zk^C-?_Z$;%(HNe1h8qusogy?0i}m!)H|ss9_xllV4=gWhX9z|hef`n;fJXF?f)VYs
z1W6xKQcGdd&>-mqB@Hc18WtpdL`lO6lUjqMla$n2XgyAWyKKa*StUz(?$Cm%yc_YF
zOf6`RdbC5lC)Q%Fvz<@e_PEa9Xm{xmy@JbciNfg_8qIyZ%1?f@FnO4tT$@XNOs}ZQ
zCAUV=QGd^MBYU7AQ&yLr*OlgP{n4lSS>Sd!G5_$}JD!;iuda(;6L3dmrzz?u;gb;Fu`A
ze{PM5Dbd7m5xbdW{Ex;lnzO@L+>c)Q@9X0`
z2{#$vBH)>qajvPHi$9^q+c*9p2=Qx8i!SwurZG{OXa7j-I^{J
zosI_=ol?1bP6f0ZyU@OSCT-V=vu?}TCa*3OThBt_&4z=pM40X?|BS9upUKg2(Md-F
z-j|hTfufc+o`TIT{`ADP-44+DV|KLboVvZR(xjKjpZNA-+PoN8jTPP=-Avw5`vva~
z27A^>T}~Us-Y1{wHebpT-pAp-)4C_duWmcvDd%see&2Pj={1nIY-pS28v4YAbIhdg
zK_~v~rV`(~n*L5Q?E`kBy+QtTP~Ce%6l@dD7MkLH0L7`T54rvJIM;6P*O5vOyw;RW
z0Rvs&L!jMOdrqs9!hkXP?_g_lkDM4UykLi%m>`08uWxfR)^#oLF{)h8Bi92OlH~Bn&UEGzBP|ONBFipzMt^zdHf*ZJ4F8G;z6olXP)3$BDgP)KSTKadHi|8
zA1El`c`9HR58)DM>q1zgmt;&=QPR~1^S$+g+_kqJ$_pDwesAsW8tL`c!};FgLj2x(
zq${o0TaR*YVc68a<@c7_J+Y5id`y_=ke8v`4J&oGf3$zmPh{)3-oLni$xq~-_sBix
zDnF60QWGonhE+(9^^YR`UA=#4|6-)41xPr3mEN!#>1F+6NPkc7U*5kI>30c`aQbS!
zVU6zgd{ON=MF+*AX#a|M1QdHk&%3=6*60muJ&HFBP%I{jVvpiQk7BLfa4#sP=sh0_
zfnrHC9*I*ecgsCjcwFAAH>}g^wZ@ft<0`#zwcfZ!Z(OT4-mBMY`oMLho{tL!cC(Jw
zE@nrn(Ok_F;f+%2>*5;z#P$HXwbR+SPNyyFbAv5w6QlAqxn4=tD1xpWr>~*i-RHgC
zU3%~133e5}L1KSRww97h^g4Y&{B5j_H!B_{7+XeZ$GW5)3(}UedboMLdV};T#r|s?
zy@wg%s9f_7eG(eZAjJ8g;YlM;5rZ;TYtx-l|yWX%vw?-R@9eTq~-5O&gcIplH>DD+Sai89B
zziv%168Gy359roiM&bdzVV7=AHWIt^h6irJB-J6v6^^X-MiI5JI#*lX%bC&Y6#XP4pKM4FFPKT395mD>55oVXLgJC&Mw
zngliv=h<$hx%!m?3)@OXzM3Z(LIg+hcnjf2^Y~E0U(4ge2!Fkxz@b#&v4V(U6!Atr
z$L*Bk%{)Gw@VD~#2*Tga!K=0u$&EgaQ+l;2y{Oxe@)L-=E>`iF3gI2RSuU3
z(i_scwZurINsT}3s>UaBYI4FaHqt#Yoy77Hrg=r7Y5r7hnxCOmUmr~rAud~>M9pyh
z6!q_PbFCvqH#=MRq^z}3@5%$c*i1+2ak*_!M~Xt}wlrT-2GP9%QKd&T@eC4P6{O=j
zUF}ZArMT|J*S}|^;xYQWVS_u}%vCf44w1=m?Cq;^JT{*Wk`pr(giS9z3tTGSWVh~K
zg#9y`fXL)*6XU8i#Y_
zF5_@+PAbhIPby{I6I-a@c`}&`tVA33>X(%y_UaA$^vhz2eR{)F`emhwr}T#X`ekK_
z{d&XG`eo&br}c(s=r1EZqc=QDe;Mgnz2N};Wuyao!*lePk)G2Vp4a1Q;(5K{pdODU
z4iYo-S=yC>v>O&G-ceFwA#t!kR%J~;qSEyezOk@f@dMkG#$^g!A3dlKJgz{9Kx>AC
zBu|I|GDm4x%g9rvlvt}YEXg4VE#dsn=oK+ZYVeNu_UMT<3jKXIKk-0e;**@%CztqK
zVPYpI`fIlJ-kQy?D=wA$@f$uSe&ff)Z_35vf4Vh@TA$aG)Zj&mwK4upAD;Wl3Jy>6l_6o2Xt@;7rale_&N%M
zadEZ>EUZ%MhK2~K11-n15Q(RiOh-TeJ)6WzCB`2r@``&(ub_7oZpz2(*DEZ)f^GbR
z(aqOzdZX#vuR+eI`B<8IgWmhi6R!&BDT9waqn}fj%{B%dwb(m!Zsgic0_~g
z&tHvn0>7D6%Pn2(q{|4b37uBAY0iAUn0t-7JFahzpCLfGqWY?{~NA
zW^vX$^Zd^|&~?xG&N<)N-gC}()(_prG_T1&r57~$GHQQs!~bgq-SYGxju$Nsy8UvN
zMVC!7&j0O@C96%&bw|Sa=woB3Jza1p(#la0!Me*ba8B5*ie%i=oO~WA;~LVg;UJ20
zhTm(qqxfeQ3<>S#D51>F3%Ux?GO1aLwHdV6gLrZFhgejDUKxeTKB*4R!X?E1(}v}?sJjmqq;wH{=&c_Bj;EdHCGt@fhmxxUSMV3zz)`
zJPri0p!YME#|1fUrX$ux>NGFNo{ob%`MBW7NH^}|ZO2^d86Ag5$ZxE)6CK2raxPo(
zEjC(JP+GZ!(p
zM$FS;vrRW|H*Yn2n_G4B+vbU|`B~U(jhJl_^K96xGB*oz6z<%apNGx%ho(h}W
zBIYXHTrZoeb#s+uZjYF)!dxetPbub1#XKH1hfC(Muz56W{>I!9F?UAHyzMdtevb6=6UhkTMDV(yQa2O{Rdhpk-6T^lbewePu99HmZh-
zL-{-giX#M6S-I9%)M{&Dtv#Y;tB+`ya(>7@x=^X@*Ru8dHFC;0P9FsoAuCTx_A?rd
zqCqvKHv5tkulwT#Jt(4)bGSLv&(-JJpk{CpHV4@&Tl=AwRI5MKq^1FFNySib@Vsun
z=Is6v<piFh~6B_Xcv^nM6juVdAg5!<7
zcpW&K)NszfX@K+ikfC5BJy-jQmQ<=g(Igz1LrCYO%NU3X7QU{Se
zzBMpRf2`f5NG^q{(jf&slIoIVkECU(yjxKFlc!-P$nj3ah{t}jaA?6}ZLX{Ay5glQ
za?o0m8attIj(41Mp71)Y=bY}~hDxgu+E+d;=(JAa=_8g{
zERS3L73$6oVsZ0H1V8059_}!vLFNg#e8#h68Uho?H0m_0V_M?4Mh)INt|d-r)K^$1
zw8WTeJ%)7>P5ASUNk8qyFv5x9#!Blc#Bhd35zNC+X=b~yPHBnHG;_PK
zKGPDPYvxX2eXb==YvwLtod)Bx{%F~==l$r_p9Y&RXslK>L@+?9I~+`>o>s8oO@(-l
z$59#xYMbdft~*t5yJ%*X+#adr*8AFFQAX(V3g)gPKsaZT6XGN13>L;MqZAtJ}BW
z)=FPnud`9@eDCjMx79)8p+{%~HI(XS6xmS9Y~==o=Vz5*zqT|`2vd8u*Y#6-UC++h
zUN@ERLHAG`aeW&R4jy6m+Orz?gREAc)zmJpU`0<*zNz2&CI+>P5dv3humW?K%|n!o
z5g|WVw_r!A7JgL%z|3A%b{O`b~O%ZoC)h))LgAgh?i`dV;iD)^I6K%
z1fKeSNR6sj_c^wzfNZauXW4f`v%PM?Ay?b@mFc6q%(WG<8XD(cvx^UxbI)kjAO))-
z?qWuneV6-MUfpz3nK4wy)NIHT`(epsrkw3%xcX3g#XVCG&(w3eH4`f^Y4iaoIeQ%o
zJq~OWWuNP1%CWRy_D&s+o!c)i;I2+1ZZ)8RkSjJJX=FmD_k@gga|1T~UACc?OxBQ^
z9P2dl)L(XG&KC-0&hFG&2BNh*DZ5)bUufoDVSS+`&S~a;VV%!zTqn&ny9Tc&vlo0G$Q`&ihY^X+3`AMV>n!#={dkAnSq-#!xdksPNzi5iJSyx@Cy
z0UkzCC8^p?B-(rwslx{R$CxxU(Y*PSNK+m3RN0e<(H<1XaAj@};_soaP(3~mzAwuD
zkT*sS3V$oXYEiJPuTYgtfo2nHs)FgyG`zWHy@s%3Wq@WNFDX_od+go6NRd(g}u@2ykN~;v>*9G94Ad8SUPT2R^@7FLln}H-Y`^7c`EGHI}
zD|?tEyTjTzj-!i<36CA+TsPxyve$tB`#{_2g16DmOrgy%YV&l`7b$4dRAIn)#uy@>-%%m>&zP5m)(VbYwHrWAn1Z=GIDU9@xw($meXi!(4Gb+~;^9UvWa-
zR%yKsm$?NY=gA#*=-)tjEC7BMa(OI*|JS|pc-7%lRcYOX6`=w~Z*)xe0x$L^C(P}Y
z)?#p5C@({(VN@%LCj=kFu75%#o)qzS6zfTmcuJTL#776sW0Cl#pt(LA-yxd|BJmkC
z4ddT~;rLn2JQ0a!RrAwG{HSCO55wm${yh_l50Ghs6<@2ECnMl9hv`donAh{~*dp+G
zpSkU0^By+uwJH3&pMMY7G4k&r{%z91?G&eNK^U5KIY-Y;VNPN6X^Hlh3)8j)l^LCJLMap_3imf{A--i2%aD0VE^H&gBBk9rDUlf9LuWKY
zXMgbW&>7FrS@wH}&S-|t=qo^H21DmGLuWigXZ*hfI#fCYo$-LqjQ=X=j4puAXogO!
ze0k{1VCYbqRxuzv=!|CQ%wXuuVCd|Y03G@z=#c+oY(C1#{|&tC;GjG0a%ON4bSNr<
z4tal%6Sa$72|7d}=ulP&I;XH2gI^Cin}dMPQw$w4yU-aR5>NjRbp8iA{|@LpEfNF&
zXTbWO0qfr}U=0+BL4eK|k`J9R3>^w~oPQ5;ah~9UBe1^_a8PFM903Ey68D9V$DxlL`
zKy8c?2RfSoodI$u=$tKp4*j;-HO!PMFx|{$-w8U|0_bEJI@zm2$L@6~dmeNs8|%5T
zuV(Wq?n}0F_B`mE!d?J=J3+_pb!_Mi0d$D4gW2!2%bEKXuh$t+(CZNWD!tB9hRz;_
z&RPl3*~8Fz8PFLd5`#NKXS&iEIv)r?X9YtCsl6O@mi(7Nr?A&q!q8d5&{@LJImOUv
zz63f~?RDtqRurK-V3GaX@I}y}`tQ{1>{mMVIyQ93dnf38a0ztC&t;*rTImd(Q?fr`
zEiD+ZE``pFf?j9SCB06;fMr9caKKtB`_S3+uNbgw=nP@#yvNWP!q6E6=nNK#AwG17
z>1Cl)*z5fFgwArUv#c}z66nyc+v{|O&iJeKI{Ux8*RcmI3hE75l8w#u-6$NckXp;=qzREj4y!BQijd|hR%CIA3E=`tg{5r86pxxJNG)1t~y|~
zU17kQsQx~nL$Ms;xE8Y6gU%T4b@oI1Abu}9VC}!$fVK4UV)FRQLx+r;SoJm`>_pfg$iw?Sw0RR^r41<;}NTzSB{6gu{RRS2D>mq2GY
z_c|k4)*0>(SVKkPna&#>5P@%N5M}p1(TTIqE_d4%u
zey{Vq>O%+fDIMt`=(O;F)xu)(QHIV!hR$FG&>7Fr*~z`mI))CJ2|6u2V9_r@XSqVq
z8O*&-3yaAuJYWsx0gKE8ot-Qu6JvtTa_)7g#tAyJ7&@OYbjVE5IeGyp!1>z=uo*4be0Q1XSx7%TA<}A-mU>U&j~=M
zMF2WvCg{u+fDUmc=$upmoy{7c^MwlNoK*pxH+hEDq5?Wp*#w<4Dxh;(1#~{;UWc+o
z(3#568Ot-Q6%3vE44vmSK<5Pw(4pV0oMwW~SPjq_2U%wh2CRh|L5DI$&{+prhwNUj
zLmmh^%j_AJ0CYY8baFgkeZn&=VoJ~%qcL=Nz#7ERApo6X`Zi89L1&c;=)9u>IIQAzILQr*eF1RY8UK?lhZ@$(v>L%+MYdw8_G@j5Ansq#}*k4S?NkkdP
zSiYI=gIl8Y{RLc}5OpI(^)x)R-k!7HQY^QhWqd-I7b6)nAIbhWi02Yh^UWLeV0
zUCtKpioz}670wngj`u$iz0Apd960s%h9`S_!*9#@d+4j!8(xkituEM}TO$jhY9$@F
z=ZOBUx9>K^-*@Xx99DtDTCb4C3iGLuHC80X3G?ZYHBKa`e;O3B#-otdbu6UyULj3&
z3aL+}^$z%LV1CpB5-$m}tM!sdye!P2A?sz4ctx1chOAda;#FZj7qVUzi6&u=2w6=c
zF+rFkL)HYuw6SAMo4lB&IWhe~rL`I{Z6=SJu=Bn}R%8(xD7hPA86}-I0#$9+79|@B
zT4^O+yICPZ-_1(U+N3yd_--V_I;HPAC19;p(y6sd-D`Skx?Vp+XG<`3N=v8Ol$wpf
zAQQflnn^CL4q=m0XQXBkVVg~;-JtZ{K&;jyacMai6rqkg*%_vB1*K-|sX2O0J703o
zQm+##g?hoCRJHYaL^1-8%KWQ5B4r+x9-)7~kQ&9KK|k3>fO3{jttTJ92-XbL$O~-M
zjas0e8`x33wo$3o$(O>ZJN2J>yWg`8_&{~j25bVuoDT0iGlYr@(
z_mlwcn?M8Aenp}@)uz?Dw8{mvkqS07S5M8;Q?KiN(<;B&!7AwcWc&OyP}N@5=k`ZA
z%oeq7i<(M{zFSmQjZ_(u`Oz5olM4K8Q|q>=sjTR`&G&bU<1gs?qh51xw2qT%zt&ZW
z$4LFe+$ZHf#nY@Zsj8hol?%y;Yl+^k4K+$#da*{;$vWPQhx^wr(PIyC
z9i)}gu7N-zs}?4(`b|AxWz{;H3Qsn@W>ZLt{WY%bbao-%crRU#eHT|X)+?#J+HOcW
zM@z)D&<2rnbVRr+2!gDFAQ+Ob-;mD-|0$oJm(P<4rQD|0wW+C$D2StPn_YW2piQHy
z2z`x4vaDLOR1aWOt-z5|J5gCbt^Dfl!F(Pb-_ip(2H46-hw{#vT}l9LCsVV7vEIfm
zeCw{7&`*Bbsey}7AG^Tus?0UW+$JUUwvKmdV60iD2i!YXBcty9oo&?qMTl=1uVxNKB1
zBPp5WfW!
z4c1@;+Rp>=UG~8KZH((QoLA9ko@mBVdaGF^CJG#bohTBMa1`H~BoZ{I>TR`P7(UQ(
z7(VC?!z-L&_|8h}FycAH@!+J}WMPgAS(8O#iZH)vO%aKy!Wt)(?lj$Gff2X)^_b{u)HRMIh-TIvB8gIwMbSL
zNw%^$%?LbZKdlN?ZT;Gzw5=Zwv9Hn}Z%}KCpu35BhrUHhW09?nF!mU~9aP$jb$5m8
zN6ML`sD4L>W)aqESXIAT&n7jT)W(#8kF$Q41$r0}6_31`WH=eBUZV#o{%mb!QtwrX
z1B^-C=r(0qb){7Et}d-)eS}bY3hjcqiUIs~`Ny(cAuFd@QOjfP$bf<$6+fIGfuE3*
zv&Zmi>|@ZQ{us14J_fbhk3o6sV+|#gm@@h+=e#$>?98+Nwb(EzKm!)19)(dl8?C7@
zHp&`D*H9K4$k{1NcBx*A?35%+oXhW&6f%b#b0}G28}y{eO^7!Jn`|reZz=_L=qpzX
z?9ptph!2n_BlaiCM}@^>?a2_OCaJr5Us*@$tH_0%}_Fo43$$lODi6r`iHi^SjFG6e$-DoHkPAaV_D}k
zmakV@N6=V~6*QLPvK*0>{VKG{6uH*~+=k;F(DrVD6zDwl)TL%^WjOWQLs|RSw)d&3
zS+CP4RI@>sl8Wbznoa~RNrlS5HW;$=m2AJjoNbCfaYZj9WXDVY&R$%HR~*0bC$GT7
z{l=fZk_R^#BU}$kM-TD&u3^*_e0ZrD{pC4%@d`X#t&z=!-0XNA=XzB;C1{ds7=I-n
zGhD;eFUd7^PWCtCxOe*Yy47Jc`~ln0iNM-`Vh>Z(VwFG;+o_QiCBx_vehp2AtY={g
zp@@vov@nHLsM@*~G@6X++y>O7aK0LUi$*}fP!UR{Vn#ln43B{79PX?up3moV{Af4H
z-u6f34_;8|*g`(_TF6GHh1^wXeTWuvQVuGTQ~{|#&*Yly_dc=}C+uaQQ*uz1q&xA3
zJJYHE|^dIqXJLf_YC5sy^L!T&hp+axGJPH0Yg^-5V-QyIe=V
zIuz+8W62Pec#Jjima@5XPKo0x$$d_qEHjk?%Z^BaWmlnPsa#+=87{E2iUP~&LYLKg
zfhAq&?I3w8efDBL7FTHutsWT)5CCfBx>rKZ^S{-b=ueiQt)tYGpna+Kkl=@JOUac=
zzxt4n$<=!;I6`6#6@5~JhL2cxl<(u69u%H~i8z(D?I%evDEn(v9i~gQhi&dL#C=%c
zDfJliWkw!%Y5{~Id)<#xF&*XXCL`7%87yrUxDc6NV@Fi&vF?SLtfbUbN=B&qjNt4Q
zJ?@l>2273SG>$ED(s1A32!E|(-U_ODAQDgwGF-C%*~
zqaSZ5L;3++1*wa=hK}hq9iGWDDBg3@hPRZ^3>|B~f|$y;g7P
zt$GC1kh+C1Kj_yKnp2oE6Xxc`*{2K=sgy|e5{uTqdb5tgaXkKe8WIZ5*6c=om7_xo
zkY;<+?-c?Iq=MYbZeMaFB>e}<*D^iyr)sNB1#qm{UL5
z)UL<&K%-tmIn;laJ9GACs(_h_W0hhf$+{!rSc5Sd#i;jotTJouJQ;SZ3Ty3LDmzw{
zwRW}&$EvZ`&eN`E!CE_4>y9-wcXDlmISf#p4RU<
zC0mC?ZAQQ6q--6=l=!slKCLian6HMc=^&nwJ6{%^1u^EV>|PfA$i6H(OX>R&Ul#qs
zTiwt4mqou(S!sQQaOdPnm>~=$hKU)XuBSoeZK#H36dNVR^~McG&`=CvM2(nnol$92
z8L|;FB1Wlkt#PAqn{m6L8%0JJqnmM)ajRh(UpK-=nQ@KL-RNobGQMWqWt1CTjhl@g
z##fCyjc*v=HY$u;jJVO;xWo9S@h#&!##ao(=wtkW@rTAA8Q(STe(;{^Z9=kUh{Q~!
zCPv)D^xKWN-$}kBRg|zYO3EJ*t8b7w>Nx(P@qJ=gObP2s$-L9}iSZ+1*M)3xqW_8U
zsPQx7hvf4s6zU%1&kf7?JL9h@+Ix%#$nVdLe>DEVc*MAmXn$iQjb9lL6Rp8X%uJD(
zg~XI{Mtd6#RaHgFcj?H|+-P@OigHFA{G!)hT<(@X_Jab$YPSK>C>K0eS-CZv0AP^2W2ztUs)N<8uwJp%;(*BX5phDo*!W1u62w?
zvx8|@i{|JRqnYJJlTIB|=qu8xg=Jjq~+`m+7D4j#QRq*f!?
zMrl=Jzr#vWzjjvL8qepY93IU{r_L%kazUw1r_PWO*--6l@Y6}zd_FsJI0d`?OM+!b
z=9&sZW`=j&oX=+{udP}7XE0+zo?C*IDQr2wf$Vn
zRNkaYr_L+T$9X|%nP#0=ax2=?RSgPRS2U;``vrwHAQFXUPO54T^4rST;m9je
z+6dr-Ef?lz(}Z<_&mx?MLh^2dIZ;n2-sAD-l#HWWpud7=`0!di-pb{`8T{gf21U6=
zQRheevUVO9!RnX~DO)!lRNK*Cl>Un84;vgY`r|DPce8{3D(J5({ar(U-RSRH`n!()
zuBX2nx;Ng|P>G)#@pBWAy3^my8Ia)~`xVVXla+8w-ozj+p)Y~XC&W4vN;?y}bS9K_
zCX{z3RCFeEO_n6PHc^j2p9%dM!pT^&f>i_4m+UlQOO}&e#h2`%WS3+a6h+}nc7e%Q
zzlI|EkgXUsP1Xp$WRE7J$>OGX=9cDu4cEB2O%^31O-7JgKN91mCwWb>m_)kfrg&qh
z$taq9sRs%<;R+$6BsMlrCfyO6v6OMs|F!B|GTXC9h3h*A$=d14`NTNkO6`
z8L*U00%$X`sY8ZsMgfFL{A@+Jbsc}NOIG>`B`!^f_)0m{liiw<*IwB@1ox|i7vSF^d}V5!2Gp&*A$fxlsu*-3
z4-nqSAp9*rcw;9JviCv|b|92?CUogcDCo~WgS&!7lt*Y_>2*_0qe^2^%>MMXN2qH1bAJb0!2U=bJ|2;SJD)&-
z8{P#{@UkS-9`)*OdnmO(A@-MLOU5S29k`cvh$Ps7=y;JYCE~#$9y$L8qho8j*KN$3
zB>aNpkwYwoV`dQRG9
zu6UA$u>Pl~fd{xafB?T(*Fz+M&Lau59dWX^oZ~IW-rC`<2;NXx;QP8GU_#7_bwvo4
z4&mlYx6FG#-gkDSbl0oudiBIbDMOR8uKT>qlkn%r)P4k-8_E^8{RkEy0^vs>T(7Pi
zY-eCU_;YQM_~;16KL3y#$dj2p{)@n0_xbCtSKaoi`x(GXQjGAQ0CQD#WkfCqu*)J#
zz8v`O?uhBZidw3un`BRZ?;u>^tw=&k4mZL+C&A7WE!dt(|$O;;CNOYWSul92yBOG#i>H9Q$
zASc$dmedd~cOQxRq1Y=38KPkdyA70T4rRwT-Q5>WMrM^#MUf%O16;8YE4d9jr$&r=
zu@d4FV{K&66HS~~#%SOy>3Wnx6dNT|8;X%3k1yq`gaA!WN(*PM1jNp{D{*Wn#$=@H
zPdWK_mx+Sp2LeMBC90^)I!w!a89JRBtWr%-2@b(mO{a$9%QAPYk$3qi|Bvz`g2_-5
zP05^!*j3O;rWbj
zJnOR~b3<&W5Q94thIA$jRqdClq8Ov3U$d;O`lVrDb<5i6^|YQF<4PZYUvcsq*I?eE?OEG
zVi(cTMF1yF44tG>@gmv^+xf)XztFt6rWG0nF!?OG0VhdswI{2F)YLN4G0=RN@!!kj
zEYi%9ApWf4p89BWPJMi{()t+l_hE{A3E?eaR#p(s~a3UQqlKU85AJPP*H@(=bL&XRWbn
zI%f@6@yOQ*6_3O{ui}xokt*I{dqIUVrBN!BDUDX4GwDU}9Ibedy^Vn;#TR}1SlGw-
z_TjLP_3a~IALrYjhkd+n9|`+QzWoK*U-s>zV1LE8kB0qK-~J-(O+3QYrTdt#M$=F~
zZa-E&o(xScC{OopME3{zm3sJbuoO;Fqy
z(Y8Cq{;f*u7Q9`@wOB;8xJH=Ywbr1@CU&f{NnVxhaKe7O(wcC&8ds$&*Yxl;_g6%k^
z)V=XKyY;41(^OA)*{LIvq?Sva50a&OSur+-9oqoxiJB75NwKP>z-%00hK9{1-il8u{hJ1~qTkNq
z7#C}$Y^5IIH8s;jxx7OUmHsxL59uLF66KZXc<35t=z;W#_C2R)zguZdMj^~p3bsh|
zvb{w*OS$Y8>1+jCq$R}V26u<_25gYd0e8IqSG&vKAicY?(z*d}>M7r&2!>GKn|N24
z)1u~UQFD6KoDnr=M$K7Kb9U666E){X&3RGt^{6>NYQ7OQ7evj4QFBq$TpTr*M9nv&
z=F+J7R@8huYA%bK%cJIssJSv~u8NxPM9tMvb4}EIH)^hpn(LzG`lz`fYHp00o1*6C
zsJSI-rlV#iYG$KmE^2O#nypc@Eo!z$&23S0d(_+!HFvW4JvQ%(n!BUs`%!aG)Z802
z_eIV9QS(65JQy_(Ma{!e^MmM*Z?1n=B-V<$b;3Lny;ri5V=5-Y8kiRM)iJhG{levqoi&6^as3
zwG4yQRp74LLkkgf`!(`R#!(Y9pv}?W-j3JAp~RIuW4SL(@M$RGD+8?5oOnU*z{k|?W;g|}IDZ&U6jUvxsMqj^Mhwksmwkmag
zhx;0wO(3CTx85BR9~sRLqvQ`SZsUgN9{b7d`HJYGYOR``HDn9t`vlJTxxy5gi|CIR
zB-5$ol;Zk5x}V$jT*q7%BbOzyURc;ENfz6=G#_w$Q0%P3ECSUzdXUd#a7F}~BsNjz
zPzvisc^jY1vFV&|SQN5g`9U)TdoLmx`h4|_kc2=R1TqWLMnO(6yepDLD21}`@I*V7
z?cY$!5`3~W8M~44l_d#zw_e~C8f}P}EJCrC#!7QktfirteW|q^>TIYKsGkXwd+a91
zTEy05k$E!A8mcLMQQ~FIB_}HRa!0%08)~df3M7U3QIyrI&_FgzjRlzWu}500#y-Kh
zeDjki$48|Q!iAIhYOIy%M?2DItFgD3eyk&Xo*HXm`tgqRg=*|srl06YU!>w33ei7}
zmKSqU%#+dS*6V64!Q@lX^4s8Dbt;8ELHi@yA5>0XRk4<;F_S}l)-i%PYOI{;pGUcr
zT>1j_j*{ZijTiEvl29>qYJR7G+V1q78^x3D(xw7sU`IVGZa?qV*>Z;6Xy#JPGa#az
zwJD>!lso>(PnXlglKXV0!{29j_%x$Yt5>Q)FeYKSdbMgFBE~gC&F)d&g5;c3
zxfM;XS)~Ru-OGN?Z>3}Cf}%9s3gKRGli;@RyrBIymj(H&Y6z3pWH=Od>M8^6ZV0eh
zOz+}`XcP$HwB2)d+l}3UT0ZQ&$?aFQO=%Paub3U+d=%6sN6cH~V&^65n9`|*uJsP;
zztU;kR-$R`OkiTM;yuc|6t%p>w=ahMP2au<_NBgkA?$DY_64xN?c3jgeVK2c5BqZ8
zJ`eU4zI`t2D}DPM*jM@X*|5Lk+h@VP+PBYyeT{E_6ZUs~`&+QD_3dxNzD{x9}fB
zpD%6xF-3PXZmD~*rG>dMWTg>XT7m9E-Hi?R#1%X^9wi=IR1#%zTN+B475AXuexLKb
z#CZ$SmGfA;N-1!M_Yz4t1HY|`dzdh-vZ$On`0exg!wI-0q+su3bm29POH=>&9N_F
zWYVdN>dY>-qQMJlCUrzleW;U{bm}w$9`PAng#AN~5ErCL`aa0lvp@2^ybmuQQv6sok9&NIQmUw<6uannrgZDok2jIWRlBo
zhv}kdWFXq#knx`~$g2%W^z019DewjAx
zG+|seceG08qu#~vFBrrBT%;7D4!ZmY0%sQe;GT`P>~
z)DCnGpDJpFqV^a6IcItDttf4jQ**yIlr_y=O2aH6orl1doyn4Lt(wI${(16wmL#DF
zlj_<9FY^=ei_XL^hsS2@^1(Y^*rSN8m(Z1UNfy^qx;{m^
zy4XD!{Q|hja7z<*ufn`CA70soH_T$s5bNTkiVdFPq&68I_#8(#S(KYyRmwYHMM;u!
z5l4zVQx41d)=j5UDk#C&H^`r!DgP<}eGW+}r504m&(nA%Mk%8rOBSKT=_eKof;rZA
zigM-GUJ^1HgKuhcMNYfCI^Tk-;+D!aa}9Uag+94O$8rRa66Ejc%SUT7%fYI9)t+-*
zSIRUan(FNrg4s+=AZdV5b9`#Jr4{mvO4?xV%(j5}mEkFXoeF=zz+c
z4v73jUCh~D4)MO(Nmrgh+pNpcWC9mnnfMjV@^aj6Y5I9lb>0=apr*T9d+@UtQpRVB
zEUV#f;Z>qm`&A--WoWxveN+$hdsM>H8|gk7Jn_@UPx2%v9_|<_LqR-Qbe|Ntwi2)H
zNXPVmqz67H@lOp;kqS5l)7<2&ld2s-I&~6*9QDt(bL<|@CG|&yTJVGid?!FllxH#W
zta17#1nc0dso$d>p@IemoPp?&W+$m|FX-9q)W`q%Uy%CXaZddSJrL9br=hAY{C446
zO&b3S{tfZ3&c9*j^(I3GyXJn6QcN`H<9R0M7Cs(cB9AIEh$ong06*tMIpb^u`#q}K
z2`+d?sWJq1@E*h_quUivM%HW9cw>-7FXs&?CuybIqsK`|Uj2_Ua$n}8G184L=NDrLV1G*mgLJx$A!lz&N*{8U>+e;KZTVvm*
ze$np7+hRGOr)Go}i1jF-)-m-tqK;$}^_8Z?!TE)woYO-pcFV)61xA9Riv9U~&V0I<
z&k59wq~H*bYDSac2h0biKPDJ{2a=2$KPx3wN0hmq&uu%_OP{GxuV0nV2mdag|L1(3
zOwgsS_h`ivS~~B+yOmr|;cA(=VS2ppqTic6))1P$<=BEOGzA=+>_w|^v-|dH|O(Y&pcjL3bBL7{>Mj`&gB;=&hiZ7N01YSLM}i-wx%=24O5NaWb2fQ
zi3klnnyp;>6m;WB==DZhpR3fwU(ffySblHnGdueQYWLRzlGjVez>uV{ct0D
z!+I5Vm4aDAtH8sJ<_f_#Gy}M_=oCurR@EF>+;=M$Mrxjil(I{G+?Jd;3!}SWDGnO3
z)#_(83H@6-ML((iDpjs^06pC~1&X(q+gvFh#mi4#J^Xy_Nk~HP79floOJ4p>MjW$z%2xp#NjEm
zj~y{qwYe5Y#@I)4jNfl@j=Qifz?wmt4bB2uRXd4r&Rb>|ResB?wggfkB*LD3OJwV~
z%2N)DWc``}8cUqDJwU;Pv2PE4=8}^Y@spKBLTW~Fb)KjBvMo>ArM1&7w)ZYmY`grT
z+U+7^ziT*zin+k(un)fh9g^E#(L{{^6^J2~_XyZlcgSvKThOt!rL#~QIL&%rwFj5k
zh2SWi#bf0~1$wjbURkvZZ}ea^VCEH#Qt(}5h#+o#Mq_0WrVE%*xYB9gBE>q2f;*;S
zqLoe^P_2V%Po&r#OB+>;yGFWCVHPe;&3^j?z3T3Vo^zH^?yIymV7aQl>aV~&sdiX_
z8Kb4M){CsmP<2;e&O5>Hue5H(>BWN3PpghtRV6ssuHyyIO5IZd&-<;
z(Lu$$z-cF`d*f~GZnE-vuKT@mRYQbm$w(-|N0+Ybre4KOyNa8*id*O^Zu(W+!dG!C
ziXE|w+4YcAu9C~7dX;P@wX5VaDXx;yWauh6P3l+4YBGG4ye5k}XEuuyeKvfCsvT6F
zJMc;8tZ@MFGaiN-!#0L~P-)!;Rgfyy(Q4Cu5<5iQRIPr8NbD4KlePMtBJrN6o1)df
zClb3v-9)W^mq_dubuC)`ZjpFj)HQ4M?~BA9QTM7=zegnYin<9}{a%sSC+eEC`h6m?
zU(`*~>i1*SZJ65O;Ky@bYka~<&7W0T5qxYx@Npf3kN1K<)hYOo5WES&Un&Uxa>wAWc)8_|u(&{{@0KBY1N`@QEFRPx68f>=gVj5qu(ow-f}Q+%fnRFZiHN!T$=uCn5OM
zg5c9S27k>9KDblxA0v1Rf=@39KBHssnO^WAoq|7z;FA%2RzdLD9fQyDf)DK!{3i%L
z1;OVQ1fSP2`0HNqXF3Ic2*IZ!_m-VLst0SG`n_L1{K${$fA+}VeD6npaL3p02!y`e(;o!HmwWnJK>c!0cLsu2_4I?9
z`@i|)K={iU^$BQS%IGfw%9k_xdO-eiPu~nkU+(D}fk5D=kNo{FzxRuu|0?;*`oDiT
NK-1vB{{!5-pq43jD?9)I

literal 0
HcmV?d00001

diff --git a/public/assets/plugins/datatables/images/sort_asc.png b/public/assets/plugins/datatables/images/sort_asc.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1ba61a8055fcb18273f2468d335572204667b1f
GIT binary patch
literal 160
zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S1|*9D%+3I*bWaz@5R22v2@;zYta_*?F5u6Q
zWR@in#&u+WgT?Hi<}D3B3}GOXuX|8Oj3tosHiJ3*4TN
zC7>_x-r1O=t(?KoTC+`+>7&2GzdqLHBg&F)2Q?&EGZ+}|Rpsc~9`m>jw35No)z4*}
HQ$iB}HK{Sd

literal 0
HcmV?d00001

diff --git a/public/assets/plugins/datatables/images/sort_asc_disabled.png b/public/assets/plugins/datatables/images/sort_asc_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb11dfe24a6c564cb7ddf8bc96703ebb121df1e7
GIT binary patch
literal 148
zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S0wixl{&NRX(Vi}jAsXkC6BcOhI9!^3NY?Do
zDX;f`c1`y6n0RgO@$!H7chZT&|Jn0dmaqO^XNm-CGtk!Ur<_=Jws3;%W$<+Mb6Mw<&;$T1GdZXL

literal 0
HcmV?d00001

diff --git a/public/assets/plugins/datatables/images/sort_both.png b/public/assets/plugins/datatables/images/sort_both.png
new file mode 100644
index 0000000000000000000000000000000000000000..af5bc7c5a10b9d6d57cb641aeec752428a07f0ca
GIT binary patch
literal 201
zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S0wixl{&NRX6FglULp08Bycxyy87-Q;~nRxO8@-UU*I^KVWyN+&SiMHu5xDOu|HNvwzODfTdXjhVyNu1
z#7^XbGKZ7LW3XeONb$RKLeE*WhqbYpIXPIqK@r4)v+qN8um%99%MPpS9d#7Ed7SL@Bp00i_>zopr0H-Zb
Aj{pDw

literal 0
HcmV?d00001

diff --git a/public/assets/plugins/datatables/images/sort_desc.png b/public/assets/plugins/datatables/images/sort_desc.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e156deb5f61d18f9e2ec5da4f6a8c94a5b4fb41
GIT binary patch
literal 158
zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S1|*9D%+3I*R8JSj5R22v2@yo
z(czD9$NuDl3Ljm9c#_#4$vXUz=f1~&WY3aa=h!;z7fOEN>ySP9QA=6C-^Dmb&tuM=
z4Z&=WZU;2WF>e%GI&mWJk^K!jrbro{W;-I>FeCfLGJl3}+Z^2)3Kw?+EoAU?^>bP0
Hl+XkKC^j|Q{b@g3TV7E(Grjn^aLC2o)_ptHrtUEoT$S@q)~)7U@V;W{6)!%@
u>N?4t-1qslpJw9!O?PJ&w0Cby .sorting_1,
+table.dataTable.order-column tbody tr > .sorting_2,
+table.dataTable.order-column tbody tr > .sorting_3, table.dataTable.display tbody tr > .sorting_1,
+table.dataTable.display tbody tr > .sorting_2,
+table.dataTable.display tbody tr > .sorting_3 {
+  background-color: #f9f9f9;
+}
+table.dataTable.order-column tbody tr.selected > .sorting_1,
+table.dataTable.order-column tbody tr.selected > .sorting_2,
+table.dataTable.order-column tbody tr.selected > .sorting_3, table.dataTable.display tbody tr.selected > .sorting_1,
+table.dataTable.display tbody tr.selected > .sorting_2,
+table.dataTable.display tbody tr.selected > .sorting_3 {
+  background-color: #acbad4;
+}
+table.dataTable.display tbody tr.odd > .sorting_1, table.dataTable.order-column.stripe tbody tr.odd > .sorting_1 {
+  background-color: #f1f1f1;
+}
+table.dataTable.display tbody tr.odd > .sorting_2, table.dataTable.order-column.stripe tbody tr.odd > .sorting_2 {
+  background-color: #f3f3f3;
+}
+table.dataTable.display tbody tr.odd > .sorting_3, table.dataTable.order-column.stripe tbody tr.odd > .sorting_3 {
+  background-color: whitesmoke;
+}
+table.dataTable.display tbody tr.odd.selected > .sorting_1, table.dataTable.order-column.stripe tbody tr.odd.selected > .sorting_1 {
+  background-color: #a6b3cd;
+}
+table.dataTable.display tbody tr.odd.selected > .sorting_2, table.dataTable.order-column.stripe tbody tr.odd.selected > .sorting_2 {
+  background-color: #a7b5ce;
+}
+table.dataTable.display tbody tr.odd.selected > .sorting_3, table.dataTable.order-column.stripe tbody tr.odd.selected > .sorting_3 {
+  background-color: #a9b6d0;
+}
+table.dataTable.display tbody tr.even > .sorting_1, table.dataTable.order-column.stripe tbody tr.even > .sorting_1 {
+  background-color: #f9f9f9;
+}
+table.dataTable.display tbody tr.even > .sorting_2, table.dataTable.order-column.stripe tbody tr.even > .sorting_2 {
+  background-color: #fbfbfb;
+}
+table.dataTable.display tbody tr.even > .sorting_3, table.dataTable.order-column.stripe tbody tr.even > .sorting_3 {
+  background-color: #fdfdfd;
+}
+table.dataTable.display tbody tr.even.selected > .sorting_1, table.dataTable.order-column.stripe tbody tr.even.selected > .sorting_1 {
+  background-color: #acbad4;
+}
+table.dataTable.display tbody tr.even.selected > .sorting_2, table.dataTable.order-column.stripe tbody tr.even.selected > .sorting_2 {
+  background-color: #adbbd6;
+}
+table.dataTable.display tbody tr.even.selected > .sorting_3, table.dataTable.order-column.stripe tbody tr.even.selected > .sorting_3 {
+  background-color: #afbdd8;
+}
+table.dataTable.display tbody tr:hover > .sorting_1, table.dataTable.order-column.hover tbody tr:hover > .sorting_1 {
+  background-color: #eaeaea;
+}
+table.dataTable.display tbody tr:hover > .sorting_2, table.dataTable.order-column.hover tbody tr:hover > .sorting_2 {
+  background-color: #ebebeb;
+}
+table.dataTable.display tbody tr:hover > .sorting_3, table.dataTable.order-column.hover tbody tr:hover > .sorting_3 {
+  background-color: #eeeeee;
+}
+table.dataTable.display tbody tr:hover.selected > .sorting_1, table.dataTable.order-column.hover tbody tr:hover.selected > .sorting_1 {
+  background-color: #a1aec7;
+}
+table.dataTable.display tbody tr:hover.selected > .sorting_2, table.dataTable.order-column.hover tbody tr:hover.selected > .sorting_2 {
+  background-color: #a2afc8;
+}
+table.dataTable.display tbody tr:hover.selected > .sorting_3, table.dataTable.order-column.hover tbody tr:hover.selected > .sorting_3 {
+  background-color: #a4b2cb;
+}
+table.dataTable.no-footer {
+  border-bottom: 1px solid #111;
+}
+table.dataTable.nowrap th, table.dataTable.nowrap td {
+  white-space: nowrap;
+}
+table.dataTable.compact thead th,
+table.dataTable.compact thead td {
+  padding: 4px 17px 4px 4px;
+}
+table.dataTable.compact tfoot th,
+table.dataTable.compact tfoot td {
+  padding: 4px;
+}
+table.dataTable.compact tbody th,
+table.dataTable.compact tbody td {
+  padding: 4px;
+}
+table.dataTable th.dt-left,
+table.dataTable td.dt-left {
+  text-align: left;
+}
+table.dataTable th.dt-center,
+table.dataTable td.dt-center,
+table.dataTable td.dataTables_empty {
+  text-align: center;
+}
+table.dataTable th.dt-right,
+table.dataTable td.dt-right {
+  text-align: right;
+}
+table.dataTable th.dt-justify,
+table.dataTable td.dt-justify {
+  text-align: justify;
+}
+table.dataTable th.dt-nowrap,
+table.dataTable td.dt-nowrap {
+  white-space: nowrap;
+}
+table.dataTable thead th.dt-head-left,
+table.dataTable thead td.dt-head-left,
+table.dataTable tfoot th.dt-head-left,
+table.dataTable tfoot td.dt-head-left {
+  text-align: left;
+}
+table.dataTable thead th.dt-head-center,
+table.dataTable thead td.dt-head-center,
+table.dataTable tfoot th.dt-head-center,
+table.dataTable tfoot td.dt-head-center {
+  text-align: center;
+}
+table.dataTable thead th.dt-head-right,
+table.dataTable thead td.dt-head-right,
+table.dataTable tfoot th.dt-head-right,
+table.dataTable tfoot td.dt-head-right {
+  text-align: right;
+}
+table.dataTable thead th.dt-head-justify,
+table.dataTable thead td.dt-head-justify,
+table.dataTable tfoot th.dt-head-justify,
+table.dataTable tfoot td.dt-head-justify {
+  text-align: justify;
+}
+table.dataTable thead th.dt-head-nowrap,
+table.dataTable thead td.dt-head-nowrap,
+table.dataTable tfoot th.dt-head-nowrap,
+table.dataTable tfoot td.dt-head-nowrap {
+  white-space: nowrap;
+}
+table.dataTable tbody th.dt-body-left,
+table.dataTable tbody td.dt-body-left {
+  text-align: left;
+}
+table.dataTable tbody th.dt-body-center,
+table.dataTable tbody td.dt-body-center {
+  text-align: center;
+}
+table.dataTable tbody th.dt-body-right,
+table.dataTable tbody td.dt-body-right {
+  text-align: right;
+}
+table.dataTable tbody th.dt-body-justify,
+table.dataTable tbody td.dt-body-justify {
+  text-align: justify;
+}
+table.dataTable tbody th.dt-body-nowrap,
+table.dataTable tbody td.dt-body-nowrap {
+  white-space: nowrap;
+}
+
+table.dataTable,
+table.dataTable th,
+table.dataTable td {
+  -webkit-box-sizing: content-box;
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+}
+
+/*
+ * Control feature layout
+ */
+.dataTables_wrapper {
+  position: relative;
+  clear: both;
+  *zoom: 1;
+  zoom: 1;
+}
+.dataTables_wrapper .dataTables_length {
+  float: left;
+}
+.dataTables_wrapper .dataTables_filter {
+  float: right;
+  text-align: right;
+}
+.dataTables_wrapper .dataTables_filter input {
+  margin-left: 0.5em;
+}
+.dataTables_wrapper .dataTables_info {
+  clear: both;
+  float: left;
+  padding-top: 0.755em;
+}
+.dataTables_wrapper .dataTables_paginate {
+  float: right;
+  text-align: right;
+  padding-top: 0.25em;
+}
+.dataTables_wrapper .dataTables_paginate .paginate_button {
+  box-sizing: border-box;
+  display: inline-block;
+  min-width: 1.5em;
+  padding: 0.5em 1em;
+  margin-left: 2px;
+  text-align: center;
+  text-decoration: none !important;
+  cursor: pointer;
+  *cursor: hand;
+  color: #333 !important;
+  border: 1px solid transparent;
+}
+.dataTables_wrapper .dataTables_paginate .paginate_button.current, .dataTables_wrapper .dataTables_paginate .paginate_button.current:hover {
+  color: #333 !important;
+  border: 1px solid #cacaca;
+  background-color: white;
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, white), color-stop(100%, #dcdcdc));
+  /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, white 0%, #dcdcdc 100%);
+  /* Chrome10+,Safari5.1+ */
+  background: -moz-linear-gradient(top, white 0%, #dcdcdc 100%);
+  /* FF3.6+ */
+  background: -ms-linear-gradient(top, white 0%, #dcdcdc 100%);
+  /* IE10+ */
+  background: -o-linear-gradient(top, white 0%, #dcdcdc 100%);
+  /* Opera 11.10+ */
+  background: linear-gradient(to bottom, white 0%, #dcdcdc 100%);
+  /* W3C */
+}
+.dataTables_wrapper .dataTables_paginate .paginate_button.disabled, .dataTables_wrapper .dataTables_paginate .paginate_button.disabled:hover, .dataTables_wrapper .dataTables_paginate .paginate_button.disabled:active {
+  cursor: default;
+  color: #666 !important;
+  border: 1px solid transparent;
+  background: transparent;
+  box-shadow: none;
+}
+.dataTables_wrapper .dataTables_paginate .paginate_button:hover {
+  color: white !important;
+  border: 1px solid #111;
+  background-color: #585858;
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #585858), color-stop(100%, #111));
+  /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #585858 0%, #111 100%);
+  /* Chrome10+,Safari5.1+ */
+  background: -moz-linear-gradient(top, #585858 0%, #111 100%);
+  /* FF3.6+ */
+  background: -ms-linear-gradient(top, #585858 0%, #111 100%);
+  /* IE10+ */
+  background: -o-linear-gradient(top, #585858 0%, #111 100%);
+  /* Opera 11.10+ */
+  background: linear-gradient(to bottom, #585858 0%, #111 100%);
+  /* W3C */
+}
+.dataTables_wrapper .dataTables_paginate .paginate_button:active {
+  outline: none;
+  background-color: #2b2b2b;
+  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #2b2b2b), color-stop(100%, #0c0c0c));
+  /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);
+  /* Chrome10+,Safari5.1+ */
+  background: -moz-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);
+  /* FF3.6+ */
+  background: -ms-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);
+  /* IE10+ */
+  background: -o-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);
+  /* Opera 11.10+ */
+  background: linear-gradient(to bottom, #2b2b2b 0%, #0c0c0c 100%);
+  /* W3C */
+  box-shadow: inset 0 0 3px #111;
+}
+.dataTables_wrapper .dataTables_paginate .ellipsis {
+  padding: 0 1em;
+}
+.dataTables_wrapper .dataTables_processing {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  width: 100%;
+  height: 40px;
+  margin-left: -50%;
+  margin-top: -25px;
+  padding-top: 20px;
+  text-align: center;
+  font-size: 1.2em;
+  background-color: white;
+  background: -webkit-gradient(linear, left top, right top, color-stop(0%, rgba(255, 255, 255, 0)), color-stop(25%, rgba(255, 255, 255, 0.9)), color-stop(75%, rgba(255, 255, 255, 0.9)), color-stop(100%, rgba(255, 255, 255, 0)));
+  /* Chrome,Safari4+ */
+  background: -webkit-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%);
+  /* Chrome10+,Safari5.1+ */
+  background: -moz-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%);
+  /* FF3.6+ */
+  background: -ms-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%);
+  /* IE10+ */
+  background: -o-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%);
+  /* Opera 11.10+ */
+  background: linear-gradient(to right, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%);
+  /* W3C */
+}
+.dataTables_wrapper .dataTables_length,
+.dataTables_wrapper .dataTables_filter,
+.dataTables_wrapper .dataTables_info,
+.dataTables_wrapper .dataTables_processing,
+.dataTables_wrapper .dataTables_paginate {
+  color: #333;
+}
+.dataTables_wrapper .dataTables_scroll {
+  clear: both;
+}
+.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody {
+  *margin-top: -1px;
+  -webkit-overflow-scrolling: touch;
+}
+.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody th > div.dataTables_sizing,
+.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody td > div.dataTables_sizing {
+  height: 0;
+  overflow: hidden;
+  margin: 0 !important;
+  padding: 0 !important;
+}
+.dataTables_wrapper.no-footer .dataTables_scrollBody {
+  border-bottom: 1px solid #111;
+}
+.dataTables_wrapper.no-footer div.dataTables_scrollHead table,
+.dataTables_wrapper.no-footer div.dataTables_scrollBody table {
+  border-bottom: none;
+}
+.dataTables_wrapper:after {
+  visibility: hidden;
+  display: block;
+  content: "";
+  clear: both;
+  height: 0;
+}
+
+@media screen and (max-width: 767px) {
+  .dataTables_wrapper .dataTables_info,
+  .dataTables_wrapper .dataTables_paginate {
+    float: none;
+    text-align: center;
+  }
+  .dataTables_wrapper .dataTables_paginate {
+    margin-top: 0.5em;
+  }
+}
+@media screen and (max-width: 640px) {
+  .dataTables_wrapper .dataTables_length,
+  .dataTables_wrapper .dataTables_filter {
+    float: none;
+    text-align: center;
+  }
+  .dataTables_wrapper .dataTables_filter {
+    margin-top: 0.5em;
+  }
+}
diff --git a/public/assets/plugins/datatables/jquery.dataTables.js b/public/assets/plugins/datatables/jquery.dataTables.js
new file mode 100644
index 00000000..2a9bdb36
--- /dev/null
+++ b/public/assets/plugins/datatables/jquery.dataTables.js
@@ -0,0 +1,14951 @@
+/*! DataTables 1.10.7
+ * ©2008-2014 SpryMedia Ltd - datatables.net/license
+ */
+
+/**
+ * @summary     DataTables
+ * @description Paginate, search and order HTML tables
+ * @version     1.10.7
+ * @file        jquery.dataTables.js
+ * @author      SpryMedia Ltd (www.sprymedia.co.uk)
+ * @contact     www.sprymedia.co.uk/contact
+ * @copyright   Copyright 2008-2014 SpryMedia Ltd.
+ *
+ * This source file is free software, available under the following license:
+ *   MIT license - http://datatables.net/license
+ *
+ * This source file is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the license files for details.
+ *
+ * For details please refer to: http://www.datatables.net
+ */
+
+/*jslint evil: true, undef: true, browser: true */
+/*globals $,require,jQuery,define,_selector_run,_selector_opts,_selector_first,_selector_row_indexes,_ext,_Api,_api_register,_api_registerPlural,_re_new_lines,_re_html,_re_formatted_numeric,_re_escape_regex,_empty,_intVal,_numToDecimal,_isNumber,_isHtml,_htmlNumeric,_pluck,_pluck_order,_range,_stripHtml,_unique,_fnBuildAjax,_fnAjaxUpdate,_fnAjaxParameters,_fnAjaxUpdateDraw,_fnAjaxDataSrc,_fnAddColumn,_fnColumnOptions,_fnAdjustColumnSizing,_fnVisibleToColumnIndex,_fnColumnIndexToVisible,_fnVisbleColumns,_fnGetColumns,_fnColumnTypes,_fnApplyColumnDefs,_fnHungarianMap,_fnCamelToHungarian,_fnLanguageCompat,_fnBrowserDetect,_fnAddData,_fnAddTr,_fnNodeToDataIndex,_fnNodeToColumnIndex,_fnGetCellData,_fnSetCellData,_fnSplitObjNotation,_fnGetObjectDataFn,_fnSetObjectDataFn,_fnGetDataMaster,_fnClearTable,_fnDeleteIndex,_fnInvalidate,_fnGetRowElements,_fnCreateTr,_fnBuildHead,_fnDrawHead,_fnDraw,_fnReDraw,_fnAddOptionsHtml,_fnDetectHeader,_fnGetUniqueThs,_fnFeatureHtmlFilter,_fnFilterComplete,_fnFilterCustom,_fnFilterColumn,_fnFilter,_fnFilterCreateSearch,_fnEscapeRegex,_fnFilterData,_fnFeatureHtmlInfo,_fnUpdateInfo,_fnInfoMacros,_fnInitialise,_fnInitComplete,_fnLengthChange,_fnFeatureHtmlLength,_fnFeatureHtmlPaginate,_fnPageChange,_fnFeatureHtmlProcessing,_fnProcessingDisplay,_fnFeatureHtmlTable,_fnScrollDraw,_fnApplyToChildren,_fnCalculateColumnWidths,_fnThrottle,_fnConvertToWidth,_fnScrollingWidthAdjust,_fnGetWidestNode,_fnGetMaxLenString,_fnStringToCss,_fnScrollBarWidth,_fnSortFlatten,_fnSort,_fnSortAria,_fnSortListener,_fnSortAttachListener,_fnSortingClasses,_fnSortData,_fnSaveState,_fnLoadState,_fnSettingsFromNode,_fnLog,_fnMap,_fnBindAction,_fnCallbackReg,_fnCallbackFire,_fnLengthOverflow,_fnRenderer,_fnDataSource,_fnRowAttributes*/
+
+(/** @lends  */function( window, document, undefined ) {
+
+(function( factory ) {
+	"use strict";
+
+	if ( typeof define === 'function' && define.amd ) {
+		// Define as an AMD module if possible
+		define( 'datatables', ['jquery'], factory );
+	}
+    else if ( typeof exports === 'object' ) {
+        // Node/CommonJS
+        module.exports = factory( require( 'jquery' ) );
+    }
+	else if ( jQuery && !jQuery.fn.dataTable ) {
+		// Define using browser globals otherwise
+		// Prevent multiple instantiations if the script is loaded twice
+		factory( jQuery );
+	}
+}
+(/** @lends  */function( $ ) {
+	"use strict";
+
+	/**
+	 * DataTables is a plug-in for the jQuery Javascript library. It is a highly
+	 * flexible tool, based upon the foundations of progressive enhancement,
+	 * which will add advanced interaction controls to any HTML table. For a
+	 * full list of features please refer to
+	 * [DataTables.net](href="http://datatables.net).
+	 *
+	 * Note that the `DataTable` object is not a global variable but is aliased
+	 * to `jQuery.fn.DataTable` and `jQuery.fn.dataTable` through which it may
+	 * be  accessed.
+	 *
+	 *  @class
+	 *  @param {object} [init={}] Configuration object for DataTables. Options
+	 *    are defined by {@link DataTable.defaults}
+	 *  @requires jQuery 1.7+
+	 *
+	 *  @example
+	 *    // Basic initialisation
+	 *    $(document).ready( function {
+	 *      $('#example').dataTable();
+	 *    } );
+	 *
+	 *  @example
+	 *    // Initialisation with configuration options - in this case, disable
+	 *    // pagination and sorting.
+	 *    $(document).ready( function {
+	 *      $('#example').dataTable( {
+	 *        "paginate": false,
+	 *        "sort": false
+	 *      } );
+	 *    } );
+	 */
+	var DataTable;
+
+	
+	/*
+	 * It is useful to have variables which are scoped locally so only the
+	 * DataTables functions can access them and they don't leak into global space.
+	 * At the same time these functions are often useful over multiple files in the
+	 * core and API, so we list, or at least document, all variables which are used
+	 * by DataTables as private variables here. This also ensures that there is no
+	 * clashing of variable names and that they can easily referenced for reuse.
+	 */
+	
+	
+	// Defined else where
+	//  _selector_run
+	//  _selector_opts
+	//  _selector_first
+	//  _selector_row_indexes
+	
+	var _ext; // DataTable.ext
+	var _Api; // DataTable.Api
+	var _api_register; // DataTable.Api.register
+	var _api_registerPlural; // DataTable.Api.registerPlural
+	
+	var _re_dic = {};
+	var _re_new_lines = /[\r\n]/g;
+	var _re_html = /<.*?>/g;
+	var _re_date_start = /^[\w\+\-]/;
+	var _re_date_end = /[\w\+\-]$/;
+	
+	// Escape regular expression special characters
+	var _re_escape_regex = new RegExp( '(\\' + [ '/', '.', '*', '+', '?', '|', '(', ')', '[', ']', '{', '}', '\\', '$', '^', '-' ].join('|\\') + ')', 'g' );
+	
+	// http://en.wikipedia.org/wiki/Foreign_exchange_market
+	// - \u20BD - Russian ruble.
+	// - \u20a9 - South Korean Won
+	// - \u20BA - Turkish Lira
+	// - \u20B9 - Indian Rupee
+	// - R - Brazil (R$) and South Africa
+	// - fr - Swiss Franc
+	// - kr - Swedish krona, Norwegian krone and Danish krone
+	// - \u2009 is thin space and \u202F is narrow no-break space, both used in many
+	//   standards as thousands separators.
+	var _re_formatted_numeric = /[',$£€¥%\u2009\u202F\u20BD\u20a9\u20BArfk]/gi;
+	
+	
+	var _empty = function ( d ) {
+		return !d || d === true || d === '-' ? true : false;
+	};
+	
+	
+	var _intVal = function ( s ) {
+		var integer = parseInt( s, 10 );
+		return !isNaN(integer) && isFinite(s) ? integer : null;
+	};
+	
+	// Convert from a formatted number with characters other than `.` as the
+	// decimal place, to a Javascript number
+	var _numToDecimal = function ( num, decimalPoint ) {
+		// Cache created regular expressions for speed as this function is called often
+		if ( ! _re_dic[ decimalPoint ] ) {
+			_re_dic[ decimalPoint ] = new RegExp( _fnEscapeRegex( decimalPoint ), 'g' );
+		}
+		return typeof num === 'string' && decimalPoint !== '.' ?
+			num.replace( /\./g, '' ).replace( _re_dic[ decimalPoint ], '.' ) :
+			num;
+	};
+	
+	
+	var _isNumber = function ( d, decimalPoint, formatted ) {
+		var strType = typeof d === 'string';
+	
+		// If empty return immediately so there must be a number if it is a
+		// formatted string (this stops the string "k", or "kr", etc being detected
+		// as a formatted number for currency
+		if ( _empty( d ) ) {
+			return true;
+		}
+	
+		if ( decimalPoint && strType ) {
+			d = _numToDecimal( d, decimalPoint );
+		}
+	
+		if ( formatted && strType ) {
+			d = d.replace( _re_formatted_numeric, '' );
+		}
+	
+		return !isNaN( parseFloat(d) ) && isFinite( d );
+	};
+	
+	
+	// A string without HTML in it can be considered to be HTML still
+	var _isHtml = function ( d ) {
+		return _empty( d ) || typeof d === 'string';
+	};
+	
+	
+	var _htmlNumeric = function ( d, decimalPoint, formatted ) {
+		if ( _empty( d ) ) {
+			return true;
+		}
+	
+		var html = _isHtml( d );
+		return ! html ?
+			null :
+			_isNumber( _stripHtml( d ), decimalPoint, formatted ) ?
+				true :
+				null;
+	};
+	
+	
+	var _pluck = function ( a, prop, prop2 ) {
+		var out = [];
+		var i=0, ien=a.length;
+	
+		// Could have the test in the loop for slightly smaller code, but speed
+		// is essential here
+		if ( prop2 !== undefined ) {
+			for ( ; i')
+			.css( {
+				position: 'absolute',
+				top: 0,
+				left: 0,
+				height: 1,
+				width: 1,
+				overflow: 'hidden'
+			} )
+			.append(
+				$('
      ')
+					.css( {
+						position: 'absolute',
+						top: 1,
+						left: 1,
+						width: 100,
+						overflow: 'scroll'
+					} )
+					.append(
+						$('
      ')
+							.css( {
+								width: '100%',
+								height: 10
+							} )
+					)
+			)
+			.appendTo( 'body' );
+	
+		var test = n.find('.test');
+	
+		// IE6/7 will oversize a width 100% element inside a scrolling element, to
+		// include the width of the scrollbar, while other browsers ensure the inner
+		// element is contained without forcing scrolling
+		browser.bScrollOversize = test[0].offsetWidth === 100;
+	
+		// In rtl text layout, some browsers (most, but not all) will place the
+		// scrollbar on the left, rather than the right.
+		browser.bScrollbarLeft = Math.round( test.offset().left ) !== 1;
+	
+		n.remove();
+	}
+	
+	
+	/**
+	 * Array.prototype reduce[Right] method, used for browsers which don't support
+	 * JS 1.6. Done this way to reduce code size, since we iterate either way
+	 *  @param {object} settings dataTables settings object
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnReduce ( that, fn, init, start, end, inc )
+	{
+		var
+			i = start,
+			value,
+			isSet = false;
+	
+		if ( init !== undefined ) {
+			value = init;
+			isSet = true;
+		}
+	
+		while ( i !== end ) {
+			if ( ! that.hasOwnProperty(i) ) {
+				continue;
+			}
+	
+			value = isSet ?
+				fn( value, that[i], i, that ) :
+				that[i];
+	
+			isSet = true;
+			i += inc;
+		}
+	
+		return value;
+	}
+	
+	/**
+	 * Add a column to the list used for the table with default values
+	 *  @param {object} oSettings dataTables settings object
+	 *  @param {node} nTh The th element for this column
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnAddColumn( oSettings, nTh )
+	{
+		// Add column to aoColumns array
+		var oDefaults = DataTable.defaults.column;
+		var iCol = oSettings.aoColumns.length;
+		var oCol = $.extend( {}, DataTable.models.oColumn, oDefaults, {
+			"nTh": nTh ? nTh : document.createElement('th'),
+			"sTitle":    oDefaults.sTitle    ? oDefaults.sTitle    : nTh ? nTh.innerHTML : '',
+			"aDataSort": oDefaults.aDataSort ? oDefaults.aDataSort : [iCol],
+			"mData": oDefaults.mData ? oDefaults.mData : iCol,
+			idx: iCol
+		} );
+		oSettings.aoColumns.push( oCol );
+	
+		// Add search object for column specific search. Note that the `searchCols[ iCol ]`
+		// passed into extend can be undefined. This allows the user to give a default
+		// with only some of the parameters defined, and also not give a default
+		var searchCols = oSettings.aoPreSearchCols;
+		searchCols[ iCol ] = $.extend( {}, DataTable.models.oSearch, searchCols[ iCol ] );
+	
+		// Use the default column options function to initialise classes etc
+		_fnColumnOptions( oSettings, iCol, $(nTh).data() );
+	}
+	
+	
+	/**
+	 * Apply options for a column
+	 *  @param {object} oSettings dataTables settings object
+	 *  @param {int} iCol column index to consider
+	 *  @param {object} oOptions object with sType, bVisible and bSearchable etc
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnColumnOptions( oSettings, iCol, oOptions )
+	{
+		var oCol = oSettings.aoColumns[ iCol ];
+		var oClasses = oSettings.oClasses;
+		var th = $(oCol.nTh);
+	
+		// Try to get width information from the DOM. We can't get it from CSS
+		// as we'd need to parse the CSS stylesheet. `width` option can override
+		if ( ! oCol.sWidthOrig ) {
+			// Width attribute
+			oCol.sWidthOrig = th.attr('width') || null;
+	
+			// Style attribute
+			var t = (th.attr('style') || '').match(/width:\s*(\d+[pxem%]+)/);
+			if ( t ) {
+				oCol.sWidthOrig = t[1];
+			}
+		}
+	
+		/* User specified column options */
+		if ( oOptions !== undefined && oOptions !== null )
+		{
+			// Backwards compatibility
+			_fnCompatCols( oOptions );
+	
+			// Map camel case parameters to their Hungarian counterparts
+			_fnCamelToHungarian( DataTable.defaults.column, oOptions );
+	
+			/* Backwards compatibility for mDataProp */
+			if ( oOptions.mDataProp !== undefined && !oOptions.mData )
+			{
+				oOptions.mData = oOptions.mDataProp;
+			}
+	
+			if ( oOptions.sType )
+			{
+				oCol._sManualType = oOptions.sType;
+			}
+	
+			// `class` is a reserved word in Javascript, so we need to provide
+			// the ability to use a valid name for the camel case input
+			if ( oOptions.className && ! oOptions.sClass )
+			{
+				oOptions.sClass = oOptions.className;
+			}
+	
+			$.extend( oCol, oOptions );
+			_fnMap( oCol, oOptions, "sWidth", "sWidthOrig" );
+	
+			/* iDataSort to be applied (backwards compatibility), but aDataSort will take
+			 * priority if defined
+			 */
+			if ( oOptions.iDataSort !== undefined )
+			{
+				oCol.aDataSort = [ oOptions.iDataSort ];
+			}
+			_fnMap( oCol, oOptions, "aDataSort" );
+		}
+	
+		/* Cache the data get and set functions for speed */
+		var mDataSrc = oCol.mData;
+		var mData = _fnGetObjectDataFn( mDataSrc );
+		var mRender = oCol.mRender ? _fnGetObjectDataFn( oCol.mRender ) : null;
+	
+		var attrTest = function( src ) {
+			return typeof src === 'string' && src.indexOf('@') !== -1;
+		};
+		oCol._bAttrSrc = $.isPlainObject( mDataSrc ) && (
+			attrTest(mDataSrc.sort) || attrTest(mDataSrc.type) || attrTest(mDataSrc.filter)
+		);
+	
+		oCol.fnGetData = function (rowData, type, meta) {
+			var innerData = mData( rowData, type, undefined, meta );
+	
+			return mRender && type ?
+				mRender( innerData, type, rowData, meta ) :
+				innerData;
+		};
+		oCol.fnSetData = function ( rowData, val, meta ) {
+			return _fnSetObjectDataFn( mDataSrc )( rowData, val, meta );
+		};
+	
+		// Indicate if DataTables should read DOM data as an object or array
+		// Used in _fnGetRowElements
+		if ( typeof mDataSrc !== 'number' ) {
+			oSettings._rowReadObject = true;
+		}
+	
+		/* Feature sorting overrides column specific when off */
+		if ( !oSettings.oFeatures.bSort )
+		{
+			oCol.bSortable = false;
+			th.addClass( oClasses.sSortableNone ); // Have to add class here as order event isn't called
+		}
+	
+		/* Check that the class assignment is correct for sorting */
+		var bAsc = $.inArray('asc', oCol.asSorting) !== -1;
+		var bDesc = $.inArray('desc', oCol.asSorting) !== -1;
+		if ( !oCol.bSortable || (!bAsc && !bDesc) )
+		{
+			oCol.sSortingClass = oClasses.sSortableNone;
+			oCol.sSortingClassJUI = "";
+		}
+		else if ( bAsc && !bDesc )
+		{
+			oCol.sSortingClass = oClasses.sSortableAsc;
+			oCol.sSortingClassJUI = oClasses.sSortJUIAscAllowed;
+		}
+		else if ( !bAsc && bDesc )
+		{
+			oCol.sSortingClass = oClasses.sSortableDesc;
+			oCol.sSortingClassJUI = oClasses.sSortJUIDescAllowed;
+		}
+		else
+		{
+			oCol.sSortingClass = oClasses.sSortable;
+			oCol.sSortingClassJUI = oClasses.sSortJUI;
+		}
+	}
+	
+	
+	/**
+	 * Adjust the table column widths for new data. Note: you would probably want to
+	 * do a redraw after calling this function!
+	 *  @param {object} settings dataTables settings object
+	 *  @memberof DataTable#oApi
+	 */
+	function _fnAdjustColumnSizing ( settings )
+	{
+		/* Not interested in doing column width calculation if auto-width is disabled */
+		if ( settings.oFeatures.bAutoWidth !== false )
+		{
+			var columns = settings.aoColumns;
+	
+			_fnCalculateColumnWidths( settings );
+			for ( var i=0 , iLen=columns.length ; i