From 1f6c3c5fd4c6fc5f54f5b5afa237cd4f45136719 Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Tue, 8 Jul 2014 00:11:48 +0200 Subject: [PATCH] Major overhaul: * Switched to semantic ui. * Add searching by location or tag * Reworked the forms --- app/AppKernel.php | 2 +- app/cache/.gitkeep | 0 app/config/config.yml | 11 +- app/console | 0 composer.json | 8 +- composer.lock | 313 +- .../Controller/EventController.php | 208 +- .../Controller/LocationController.php | 100 + .../Controller/TagController.php | 103 + .../Bundle/CalciferBundle/Entity/Event.php | 41 +- .../Bundle/CalciferBundle/Entity/Location.php | 4 +- .../Resources/assets/css/events.scss | 31 + .../assets/css/jquery.datetimepicker.scss | 366 + .../Resources/assets/js/events.js | 10 + .../assets/js/jquery.datetimepicker.js | 1415 ++ .../Resources/views/Event/edit.html.twig | 41 +- .../Resources/views/Event/event_box.html.twig | 42 + .../views/Event/event_form.html.twig | 107 + .../Resources/views/Event/index.html.twig | 71 +- .../Resources/views/Event/new.html.twig | 419 +- .../Resources/views/Event/show.html.twig | 69 +- .../Resources/views/Location/show.html.twig | 0 .../Resources/views/Tag/show.html.twig | 0 .../Resources/views/layout.html.twig | 14 +- .../Resources/views/navigation.html.twig | 24 +- web/css/custom.css | 33 + web/css/events.css | 0 web/css/semantic.css | 15364 ++++++++++++++++ web/css/semantic.min.css | 14 + web/fonts/basic.icons.eot | Bin 0 -> 40166 bytes web/fonts/basic.icons.svg | 450 + web/fonts/basic.icons.ttf | Bin 0 -> 39924 bytes web/fonts/basic.icons.woff | Bin 0 -> 24676 bytes web/fonts/icons.eot | Bin 0 -> 37405 bytes web/fonts/icons.otf | Bin 0 -> 61896 bytes web/fonts/icons.svg | 399 + web/fonts/icons.ttf | Bin 0 -> 79076 bytes web/fonts/icons.woff | Bin 0 -> 43572 bytes web/images/loader-large-inverted.gif | Bin 0 -> 10168 bytes web/images/loader-large.gif | Bin 0 -> 8492 bytes web/images/loader-medium-inverted.gif | Bin 0 -> 5384 bytes web/images/loader-medium.gif | Bin 0 -> 4472 bytes web/images/loader-mini-inverted.gif | Bin 0 -> 2722 bytes web/images/loader-mini.gif | Bin 0 -> 2548 bytes web/images/loader-small-inverted.gif | Bin 0 -> 4241 bytes web/images/loader-small.gif | Bin 0 -> 3447 bytes web/javascript/semantic.js | 12183 ++++++++++++ web/javascript/semantic.min.js | 16 + web/js/jquery.js | 0 web/js/semantic.js | 12183 ++++++++++++ web/js/semantic.min.js | 16 + 51 files changed, 43286 insertions(+), 771 deletions(-) mode change 100644 => 100755 app/cache/.gitkeep mode change 100644 => 100755 app/console mode change 100644 => 100755 composer.lock create mode 100755 src/Hackspace/Bundle/CalciferBundle/Controller/LocationController.php create mode 100755 src/Hackspace/Bundle/CalciferBundle/Controller/TagController.php create mode 100755 src/Hackspace/Bundle/CalciferBundle/Resources/assets/css/events.scss create mode 100755 src/Hackspace/Bundle/CalciferBundle/Resources/assets/css/jquery.datetimepicker.scss create mode 100755 src/Hackspace/Bundle/CalciferBundle/Resources/assets/js/events.js create mode 100644 src/Hackspace/Bundle/CalciferBundle/Resources/assets/js/jquery.datetimepicker.js create mode 100755 src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/event_box.html.twig create mode 100755 src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/event_form.html.twig create mode 100755 src/Hackspace/Bundle/CalciferBundle/Resources/views/Location/show.html.twig create mode 100755 src/Hackspace/Bundle/CalciferBundle/Resources/views/Tag/show.html.twig create mode 100755 web/css/custom.css create mode 100755 web/css/events.css create mode 100755 web/css/semantic.css create mode 100755 web/css/semantic.min.css create mode 100755 web/fonts/basic.icons.eot create mode 100755 web/fonts/basic.icons.svg create mode 100755 web/fonts/basic.icons.ttf create mode 100755 web/fonts/basic.icons.woff create mode 100755 web/fonts/icons.eot create mode 100755 web/fonts/icons.otf create mode 100755 web/fonts/icons.svg create mode 100755 web/fonts/icons.ttf create mode 100755 web/fonts/icons.woff create mode 100755 web/images/loader-large-inverted.gif create mode 100755 web/images/loader-large.gif create mode 100755 web/images/loader-medium-inverted.gif create mode 100755 web/images/loader-medium.gif create mode 100755 web/images/loader-mini-inverted.gif create mode 100755 web/images/loader-mini.gif create mode 100755 web/images/loader-small-inverted.gif create mode 100755 web/images/loader-small.gif create mode 100755 web/javascript/semantic.js create mode 100755 web/javascript/semantic.min.js mode change 100644 => 100755 web/js/jquery.js create mode 100755 web/js/semantic.js create mode 100755 web/js/semantic.min.js diff --git a/app/AppKernel.php b/app/AppKernel.php index 67d0416..829f825 100755 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -17,7 +17,7 @@ class AppKernel extends Kernel new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(), new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(), new Hackspace\Bundle\CalciferBundle\CalciferBundle(), - new Braincrafted\Bundle\BootstrapBundle\BraincraftedBootstrapBundle(), + new Knp\Bundle\MarkdownBundle\KnpMarkdownBundle(), ); if (in_array($this->getEnvironment(), array('dev', 'test'))) { diff --git a/app/cache/.gitkeep b/app/cache/.gitkeep old mode 100644 new mode 100755 diff --git a/app/config/config.yml b/app/config/config.yml index 6182079..ad67c1d 100755 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -28,12 +28,13 @@ framework: twig: debug: "%kernel.debug%" strict_variables: "%kernel.debug%" + cache: false # Assetic Configuration assetic: debug: "%kernel.debug%" use_controller: false - bundles: [ ] + bundles: [ "CalciferBundle" ] #java: /usr/bin/java filters: less: @@ -41,6 +42,7 @@ assetic: node_paths: [/usr/lib/node_modules] apply_to: "\.less$" cssrewrite: ~ + compass: ~ #closure: # jar: "%kernel.root_dir%/Resources/java/compiler.jar" #yui_css: @@ -72,5 +74,8 @@ swiftmailer: password: "%mailer_password%" spool: { type: memory } -braincrafted_bootstrap: - less_filter: less +services: + twig.extension.text: + class: Twig_Extensions_Extension_Text + tags: + - { name: twig.extension } diff --git a/app/console b/app/console old mode 100644 new mode 100755 diff --git a/composer.json b/composer.json index 11d73cc..2a4d524 100755 --- a/composer.json +++ b/composer.json @@ -24,16 +24,16 @@ "symfony/symfony": "2.5.*", "doctrine/orm": "~2.2,>=2.2.3", "doctrine/doctrine-bundle": "~1.2", - "twig/extensions": "~1.0", + "twig/extensions": "~1.1", "symfony/assetic-bundle": "~2.3", "symfony/swiftmailer-bundle": "~2.3", "symfony/monolog-bundle": "~2.4", "sensio/distribution-bundle": "~3.0", "sensio/framework-extra-bundle": "~3.0", "incenteev/composer-parameter-handler": "~2.0", - "braincrafted/bootstrap-bundle": "~2.0", - "twbs/bootstrap": "3.0.*", - "jquery/jquery": "1.10.*" + "jquery/jquery": "1.10.*", + "knplabs/knp-markdown-bundle": "~1.3", + "jsvrcek/ics": "dev-master" }, "require-dev": { "sensio/generator-bundle": "~2.3" diff --git a/composer.lock b/composer.lock old mode 100644 new mode 100755 index a7b890a..ca5d65b --- a/composer.lock +++ b/composer.lock @@ -4,81 +4,20 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "7754fabfaab6beb14c510a29043644b2", + "hash": "742fd364d982b3f6991eaf2d26110902", "packages": [ - { - "name": "braincrafted/bootstrap-bundle", - "version": "v2.0.1", - "target-dir": "Braincrafted/Bundle/BootstrapBundle", - "source": { - "type": "git", - "url": "https://github.com/braincrafted/bootstrap-bundle.git", - "reference": "dc6169b1e29d8668cda960aa663fcc4bbd602bd4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/braincrafted/bootstrap-bundle/zipball/dc6169b1e29d8668cda960aa663fcc4bbd602bd4", - "reference": "dc6169b1e29d8668cda960aa663fcc4bbd602bd4", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "symfony/console": "~2.3", - "symfony/finder": "~2.3", - "symfony/form": "~2.3", - "symfony/framework-bundle": "~2.3", - "symfony/twig-bundle": "~2.3" - }, - "require-dev": { - "knplabs/knp-menu": "~2.0@alpha", - "knplabs/knp-menu-bundle": "~2.0@alpha", - "knplabs/knp-paginator-bundle": "dev-master", - "mockery/mockery": "0.8.*", - "phpunit/phpunit": "3.7.*", - "symfony/assetic-bundle": "~2.3" - }, - "suggest": { - "knplabs/knp-menu": "Required to use KnpMenuBundle.", - "knplabs/knp-menu-bundle": "BraincraftedBootstrapBundle styles the menus provided by KnpMenuBundle.", - "knplabs/knp-paginator-bundle": "BraincraftedBootstrapBundle styles the pagination provided by KnpPaginatorBundle.", - "twbs/bootstrap": "Twitter Bootstrap provides the assets (images, CSS and JS)" - }, - "type": "symfony-bundle", - "autoload": { - "psr-0": { - "Braincrafted\\Bundle\\BootstrapBundle": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Florian Eckerstorfer", - "email": "florian@eckerstorfer.co", - "homepage": "http://florian.ec", - "role": "Developer" - } - ], - "description": "BraincraftedBootstrapBundle integrates Bootstrap into Symfony2 by providing templates, Twig extensions, services and commands.", - "keywords": [ - "bootstrap" - ], - "time": "2014-04-03 16:59:23" - }, { "name": "doctrine/annotations", - "version": "v1.1.2", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "40db0c96985aab2822edbc4848b3bd2429e02670" + "reference": "d9b1a37e9351ddde1f19f09a02e3d6ee92e82efd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/40db0c96985aab2822edbc4848b3bd2429e02670", - "reference": "40db0c96985aab2822edbc4848b3bd2429e02670", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/d9b1a37e9351ddde1f19f09a02e3d6ee92e82efd", + "reference": "d9b1a37e9351ddde1f19f09a02e3d6ee92e82efd", "shasum": "" }, "require": { @@ -86,12 +25,13 @@ "php": ">=5.3.2" }, "require-dev": { - "doctrine/cache": "1.*" + "doctrine/cache": "1.*", + "phpunit/phpunit": "4.*" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.3.x-dev" } }, "autoload": { @@ -105,7 +45,7 @@ ], "authors": [ { - "name": "Jonathan H. Wage", + "name": "Jonathan Wage", "email": "jonwage@gmail.com", "homepage": "http://www.jwage.com/", "role": "Creator" @@ -137,7 +77,7 @@ "docblock", "parser" ], - "time": "2013-06-16 21:33:03" + "time": "2014-07-06 15:52:21" }, { "name": "doctrine/cache", @@ -802,6 +742,113 @@ }, "type": "library" }, + { + "name": "jsvrcek/ics", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/jasvrcek/ICS.git", + "reference": "85e3e34214547a9981bd3be38633f9dce4f85094" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/jasvrcek/ICS/zipball/85e3e34214547a9981bd3be38633f9dce4f85094", + "reference": "85e3e34214547a9981bd3be38633f9dce4f85094", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "3.6.*" + }, + "type": "library", + "autoload": { + "psr-0": { + "Jsvrcek\\ICS\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Justin Svrcek", + "homepage": "https://github.com/jasvrcek" + } + ], + "description": "abstraction layer for creating multi-byte safe RFC 5545 compliant .ics files", + "homepage": "https://github.com/jasvrcek/ICS", + "keywords": [ + ".ics", + "RFC 5545", + "calendar", + "export", + "ical", + "multi-byte safe" + ], + "time": "2013-10-28 17:21:17" + }, + { + "name": "knplabs/knp-markdown-bundle", + "version": "1.3.2", + "target-dir": "Knp/Bundle/MarkdownBundle", + "source": { + "type": "git", + "url": "https://github.com/KnpLabs/KnpMarkdownBundle.git", + "reference": "c24fca93e1ecedbbc8a90b4df3449eed30774d59" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/KnpLabs/KnpMarkdownBundle/zipball/c24fca93e1ecedbbc8a90b4df3449eed30774d59", + "reference": "c24fca93e1ecedbbc8a90b4df3449eed30774d59", + "shasum": "" + }, + "require": { + "michelf/php-markdown": "1.4.0", + "php": ">=5.3.9", + "symfony/framework-bundle": "~2.1" + }, + "suggest": { + "ext-sundown": "to use optional support for php-sundown extension instead of php implementation", + "symfony/twig-bundle": "to use the Twig markdown filter" + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev" + } + }, + "autoload": { + "psr-0": { + "Knp\\Bundle\\MarkdownBundle": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "KnpLabs Team", + "homepage": "http://knplabs.com" + }, + { + "name": "Symfony Community", + "homepage": "http://github.com/KnpLabs/KnpMarkdownBundle/contributors" + } + ], + "description": "Knplabs markdown bundle transforms markdown into html", + "homepage": "http://github.com/KnpLabs/KnpMarkdownBundle", + "keywords": [ + "bundle", + "knp", + "knplabs", + "markdown" + ], + "time": "2014-02-20 11:01:37" + }, { "name": "kriswallsmith/assetic", "version": "v1.1.2", @@ -873,6 +920,57 @@ ], "time": "2013-07-19 00:03:27" }, + { + "name": "michelf/php-markdown", + "version": "1.4.0", + "source": { + "type": "git", + "url": "https://github.com/michelf/php-markdown.git", + "reference": "96d8150406f67e683ef4acc09fef91785fef1266" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/michelf/php-markdown/zipball/96d8150406f67e683ef4acc09fef91785fef1266", + "reference": "96d8150406f67e683ef4acc09fef91785fef1266", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-lib": "1.4.x-dev" + } + }, + "autoload": { + "psr-0": { + "Michelf": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Michel Fortin", + "email": "michel.fortin@michelf.ca", + "homepage": "http://michelf.ca/", + "role": "Developer" + }, + { + "name": "John Gruber", + "homepage": "http://daringfireball.net/" + } + ], + "description": "PHP Markdown", + "homepage": "http://michelf.ca/projects/php-markdown/", + "keywords": [ + "markdown" + ], + "time": "2013-11-29 17:09:24" + }, { "name": "monolog/monolog", "version": "1.10.0", @@ -1495,69 +1593,27 @@ ], "time": "2014-05-31 18:45:50" }, - { - "name": "twbs/bootstrap", - "version": "v3.0.3", - "source": { - "type": "git", - "url": "https://github.com/twbs/bootstrap.git", - "reference": "6d03173a1aad98e75f7d33e65b411c519176c59a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/twbs/bootstrap/zipball/6d03173a1aad98e75f7d33e65b411c519176c59a", - "reference": "6d03173a1aad98e75f7d33e65b411c519176c59a", - "shasum": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0.x-dev" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "Jacob Thornton", - "email": "jacobthornton@gmail.com" - }, - { - "name": "Mark Otto", - "email": "markdotto@gmail.com" - } - ], - "description": "Sleek, intuitive, and powerful mobile first front-end framework for faster and easier web development.", - "homepage": "http://getbootstrap.com", - "keywords": [ - "bootstrap", - "css" - ], - "time": "2013-12-05 16:09:10" - }, { "name": "twig/extensions", - "version": "v1.0.1", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/fabpot/Twig-extensions.git", - "reference": "f91a82ec225e5bb108e01a0f93c9be04f84dcfa0" + "reference": "c0ab818595338dd5569369bfce2552d02cec5d50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/Twig-extensions/zipball/f91a82ec225e5bb108e01a0f93c9be04f84dcfa0", - "reference": "f91a82ec225e5bb108e01a0f93c9be04f84dcfa0", + "url": "https://api.github.com/repos/fabpot/Twig-extensions/zipball/c0ab818595338dd5569369bfce2552d02cec5d50", + "reference": "c0ab818595338dd5569369bfce2552d02cec5d50", "shasum": "" }, "require": { - "twig/twig": "~1.0" + "twig/twig": "~1.12" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -1580,24 +1636,23 @@ "description": "Common additional features for Twig that do not directly belong in core", "homepage": "https://github.com/fabpot/Twig-extensions", "keywords": [ - "debug", "i18n", "text" ], - "time": "2013-10-18 19:37:15" + "time": "2014-07-05 10:01:35" }, { "name": "twig/twig", - "version": "v1.15.1", + "version": "v1.16.0", "source": { "type": "git", "url": "https://github.com/fabpot/Twig.git", - "reference": "1fb5784662f438d7d96a541e305e28b812e2eeed" + "reference": "8ce37115802e257a984a82d38254884085060024" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/Twig/zipball/1fb5784662f438d7d96a541e305e28b812e2eeed", - "reference": "1fb5784662f438d7d96a541e305e28b812e2eeed", + "url": "https://api.github.com/repos/fabpot/Twig/zipball/8ce37115802e257a984a82d38254884085060024", + "reference": "8ce37115802e257a984a82d38254884085060024", "shasum": "" }, "require": { @@ -1606,7 +1661,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.15-dev" + "dev-master": "1.16-dev" } }, "autoload": { @@ -1641,7 +1696,7 @@ "keywords": [ "templating" ], - "time": "2014-02-13 10:19:29" + "time": "2014-07-05 12:19:05" } ], "packages-dev": [ @@ -1700,9 +1755,9 @@ ], "minimum-stability": "stable", - "stability-flags": [ - - ], + "stability-flags": { + "jsvrcek/ics": 20 + }, "platform": { "php": ">=5.3.3" }, diff --git a/src/Hackspace/Bundle/CalciferBundle/Controller/EventController.php b/src/Hackspace/Bundle/CalciferBundle/Controller/EventController.php index 392490d..a9a88f1 100755 --- a/src/Hackspace/Bundle/CalciferBundle/Controller/EventController.php +++ b/src/Hackspace/Bundle/CalciferBundle/Controller/EventController.php @@ -2,6 +2,9 @@ namespace Hackspace\Bundle\CalciferBundle\Controller; +use Doctrine\ORM\EntityManager; +use Hackspace\Bundle\CalciferBundle\Entity\Location; +use Hackspace\Bundle\CalciferBundle\Entity\Tag; use Symfony\Component\HttpFoundation\Request; use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; @@ -29,7 +32,7 @@ class EventController extends Controller { $em = $this->getDoctrine()->getManager(); - $entities = $em->getRepository('CalciferBundle:Event')->findAll(); + $entities = $em->getRepository('CalciferBundle:Event')->findBy([],['startdate' => 'ASC']); return array( 'entities' => $entities, @@ -49,6 +52,52 @@ class EventController extends Controller $entity->setSummary($request->get('summary')); $entity->setUrl($request->get('url')); $startdate = $request->get('startdate'); + $startdate = new \DateTime($startdate); + $entity->setStartdate($startdate); + + $enddate = $request->get('enddate'); + if (strlen($enddate) > 0) { + $enddate = new \DateTime($enddate); + $entity->setenddate($enddate); + } + + $location = $request->get('location'); + if (strlen($location) > 0) { + // check if the location already exists + /** @var EntityManager $em */ + $em = $this->getDoctrine()->getManager(); + $repo = $em->getRepository('CalciferBundle:Location'); + $results = $repo->findBy(['name' => $location]); + if (count($results) > 0) { + $entity->setLocation($results[0]); + } else { + $location_obj = new Location(); + $location_obj->setName($location); + $em->persist($location_obj); + $em->flush(); + $entity->setLocation($location_obj); + } + } + + $tags = $request->get('tags'); + if (strlen($tags) > 0) { + $tags = explode(',',$tags); + $em = $this->getDoctrine()->getManager(); + $repo = $em->getRepository('CalciferBundle:Tag'); + foreach ($tags as $tag) { + $tag = trim($tag); + $results = $repo->findBy(['name' => $tag]); + if (count($results) > 0) { + $entity->addTag($results[0]); + } else { + $tag_obj = new Tag(); + $tag_obj->setName($tag); + $em->persist($tag_obj); + $em->flush(); + $entity->addTag($tag_obj); + } + } + } if ($entity->isValid()) { @@ -64,25 +113,6 @@ class EventController extends Controller ); } - /** - * Creates a form to create a Event entity. - * - * @param Event $entity The entity - * - * @return \Symfony\Component\Form\Form The form - */ - private function createCreateForm(Event $entity) - { - $form = $this->createForm(new EventType(), $entity, array( - 'action' => $this->generateUrl('_create'), - 'method' => 'POST', - )); - - $form->add('submit', 'submit', array('label' => 'Create')); - - return $form; - } - /** * Displays a form to create a new Event entity. * @@ -93,11 +123,9 @@ class EventController extends Controller public function newAction() { $entity = new Event(); - $form = $this->createCreateForm($entity); return array( 'entity' => $entity, - 'form' => $form->createView(), ); } @@ -118,11 +146,8 @@ class EventController extends Controller throw $this->createNotFoundException('Unable to find Event entity.'); } - $deleteForm = $this->createDeleteForm($id); - return array( - 'entity' => $entity, - 'delete_form' => $deleteForm->createView(), + 'entity' => $entity ); } @@ -143,107 +168,92 @@ class EventController extends Controller throw $this->createNotFoundException('Unable to find Event entity.'); } - $editForm = $this->createEditForm($entity); - $deleteForm = $this->createDeleteForm($id); - return array( 'entity' => $entity, - 'edit_form' => $editForm->createView(), - 'delete_form' => $deleteForm->createView(), ); } - /** - * Creates a form to edit a Event entity. - * - * @param Event $entity The entity - * - * @return \Symfony\Component\Form\Form The form - */ - private function createEditForm(Event $entity) - { - $form = $this->createForm(new EventType(), $entity, array( - 'action' => $this->generateUrl('_update', array('id' => $entity->getId())), - 'method' => 'PUT', - )); - - $form->add('submit', 'submit', array('label' => 'Update')); - - return $form; - } /** * Edits an existing Event entity. * * @Route("/{id}", name="_update") - * @Method("PUT") + * @Method("POST") * @Template("CalciferBundle:Event:edit.html.twig") */ public function updateAction(Request $request, $id) { $em = $this->getDoctrine()->getManager(); + /** @var Event $entity */ $entity = $em->getRepository('CalciferBundle:Event')->find($id); if (!$entity) { throw $this->createNotFoundException('Unable to find Event entity.'); } - $deleteForm = $this->createDeleteForm($id); - $editForm = $this->createEditForm($entity); - $editForm->handleRequest($request); + $entity->setDescription($request->get('description')); + $entity->setSummary($request->get('summary')); + $entity->setUrl($request->get('url')); + $startdate = $request->get('startdate'); + $startdate = new \DateTime($startdate); + $entity->setStartdate($startdate); - if ($editForm->isValid()) { + $enddate = $request->get('enddate'); + if (strlen($enddate) > 0) { + $enddate = new \DateTime($enddate); + $entity->setenddate($enddate); + } + + $location = $request->get('location'); + if (strlen($location) > 0) { + // check if the location already exists + /** @var EntityManager $em */ + $em = $this->getDoctrine()->getManager(); + $repo = $em->getRepository('CalciferBundle:Location'); + $results = $repo->findBy(['name' => $location]); + if (count($results) > 0) { + $entity->setLocation($results[0]); + } else { + $location_obj = new Location(); + $location_obj->setName($location); + $em->persist($location_obj); + $em->flush(); + $entity->setLocation($location_obj); + } + } + + $tags = $request->get('tags'); + if (strlen($tags) > 0) { + $tags = explode(',',$tags); + $em = $this->getDoctrine()->getManager(); + $repo = $em->getRepository('CalciferBundle:Tag'); + foreach ($tags as $tag) { + $tag = trim($tag); + $results = $repo->findBy(['name' => $tag]); + if (count($results) > 0) { + $entity->addTag($results[0]); + } else { + $tag_obj = new Tag(); + $tag_obj->setName($tag); + $em->persist($tag_obj); + $em->flush(); + $entity->addTag($tag_obj); + } + } + } + + + if ($entity->isValid()) { + $em = $this->getDoctrine()->getManager(); + $em->persist($entity); $em->flush(); - return $this->redirect($this->generateUrl('_edit', array('id' => $id))); + return $this->redirect($this->generateUrl('_show', array('id' => $entity->getId()))); } return array( 'entity' => $entity, - 'edit_form' => $editForm->createView(), - 'delete_form' => $deleteForm->createView(), + ); } - /** - * Deletes a Event entity. - * - * @Route("/{id}", name="_delete") - * @Method("DELETE") - */ - public function deleteAction(Request $request, $id) - { - $form = $this->createDeleteForm($id); - $form->handleRequest($request); - - if ($form->isValid()) { - $em = $this->getDoctrine()->getManager(); - $entity = $em->getRepository('CalciferBundle:Event')->find($id); - - if (!$entity) { - throw $this->createNotFoundException('Unable to find Event entity.'); - } - - $em->remove($entity); - $em->flush(); - } - - return $this->redirect($this->generateUrl('')); - } - - /** - * Creates a form to delete a Event entity by id. - * - * @param mixed $id The entity id - * - * @return \Symfony\Component\Form\Form The form - */ - private function createDeleteForm($id) - { - return $this->createFormBuilder() - ->setAction($this->generateUrl('_delete', array('id' => $id))) - ->setMethod('DELETE') - ->add('submit', 'submit', array('label' => 'Delete')) - ->getForm() - ; - } } diff --git a/src/Hackspace/Bundle/CalciferBundle/Controller/LocationController.php b/src/Hackspace/Bundle/CalciferBundle/Controller/LocationController.php new file mode 100755 index 0000000..1ae9a95 --- /dev/null +++ b/src/Hackspace/Bundle/CalciferBundle/Controller/LocationController.php @@ -0,0 +1,100 @@ +getDoctrine()->getManager(); + + /** @var Location $location */ + $location = $em->getRepository('CalciferBundle:Location')->find($id); + + if (!$location) { + throw $this->createNotFoundException('Unable to find Location entity.'); + } + + $em = $this->getDoctrine()->getManager(); + + $entities = $em->getRepository('CalciferBundle:Event')->findBy(['locations_id' => $location->getId()],['startdate' => 'ASC']); + + return array( + 'entities' => $entities, + 'location' => $location, + ); + } + + /** + * Finds and displays a Event entity. + * + * @Route("/{id}.ics", requirements={"id" = "\d+"}, name="location_show_ics") + * @Method("GET") + */ + public function showActionICS($id) + { + $results = $this->showAction(str_replace('.ics','',$id)); + $entities = $results['entities']; + + $calendar = new Calendar(); + $calendar->setProdId('-//My Company//Cool Calendar App//EN'); + + foreach($entities as $entity) { + /** @var Event $entity */ + $event = new CalendarEvent(); + $event->setStart($entity->getStartdate()); + if ($entity->getEnddate() instanceof DateTime) + $event->setEnd($entity->getEnddate()); + $event->setSummary($entity->getSummary()); + $event->setDescription($entity->getDescription()); + $location = new \Jsvrcek\ICS\Model\Description\Location(); + $location->setName($entity->getLocation()->getName()); + $event->setLocations([$location]); + $calendar->addEvent($event); + } + + $calendarExport = new CalendarExport(new CalendarStream, new Formatter()); + $calendarExport->addCalendar($calendar); + + //output .ics formatted text + $result = $calendarExport->getStream(); + + $response = new Response($result); + $response->headers->set('Content-Type', 'text/calendar'); + + return $response; + } +} diff --git a/src/Hackspace/Bundle/CalciferBundle/Controller/TagController.php b/src/Hackspace/Bundle/CalciferBundle/Controller/TagController.php new file mode 100755 index 0000000..3c85f91 --- /dev/null +++ b/src/Hackspace/Bundle/CalciferBundle/Controller/TagController.php @@ -0,0 +1,103 @@ +getDoctrine()->getManager(); + + /** @var Tag $tag */ + $tag = $em->getRepository('CalciferBundle:Tag')->find($id); + + if (!$tag) { + throw $this->createNotFoundException('Unable to find tag entity.'); + } + + /** @var QueryBuilder $qb */ + $qb = $em->createQueryBuilder(); + $qb ->select(array('e')) + ->from('CalciferBundle:Event', 'e') + ->join('e.tags', 't', 'WITH', $qb->expr()->in('t.id', $tag->getId())) + ->orderBy('e.startdate'); + $entities = $qb->getQuery()->execute(); + + return array( + 'entities' => $entities, + 'tag' => $tag, + ); + } + + /** + * Finds and displays a Event entity. + * + * @Route("/{id}.ics", requirements={"id" = "\d+"}, name="tag_show_ics") + * @Method("GET") + */ + public function showActionICS($id) + { + $results = $this->showAction(str_replace('.ics','',$id)); + $entities = $results['entities']; + + $calendar = new Calendar(); + $calendar->setProdId('-//My Company//Cool Calendar App//EN'); + + foreach($entities as $entity) { + /** @var Event $entity */ + $event = new CalendarEvent(); + $event->setStart($entity->getStartdate()); + $event->setEnd($entity->getEnddate()); + $event->setSummary($entity->getSummary()); + $event->setDescription($entity->getDescription()); + $location = new \Jsvrcek\ICS\Model\Description\Location(); + $location->setName($entity->getLocation()->getName()); + $event->setLocations([$location]); + $calendar->addEvent($event); + } + + $calendarExport = new CalendarExport(new CalendarStream, new Formatter()); + $calendarExport->addCalendar($calendar); + + //output .ics formatted text + $result = $calendarExport->getStream(); + + $response = new Response($result); + $response->headers->set('Content-Type', 'text/calendar'); + + return $response; + } +} diff --git a/src/Hackspace/Bundle/CalciferBundle/Entity/Event.php b/src/Hackspace/Bundle/CalciferBundle/Entity/Event.php index 2a52774..6f340cc 100755 --- a/src/Hackspace/Bundle/CalciferBundle/Entity/Event.php +++ b/src/Hackspace/Bundle/CalciferBundle/Entity/Event.php @@ -3,6 +3,7 @@ namespace Hackspace\Bundle\CalciferBundle\Entity; use Doctrine\ORM\Mapping as ORM; +use Doctrine\ORM\PersistentCollection; /** * Event @@ -45,7 +46,7 @@ class Event /** * @var string * - * @ORM\Column(name="description", type="string", length=255, nullable=true) + * @ORM\Column(name="description", type="text", nullable=true) */ private $description; @@ -59,7 +60,7 @@ class Event /** * @var Location * - * @ORM\OneToOne(targetEntity="Location") + * @ORM\ManyToOne(targetEntity="Location") * @ORM\JoinColumn(name="locations_id", referencedColumnName="id") */ private $location; @@ -74,13 +75,13 @@ class Event /** * @var array * - * @ORM\ManyToMany(targetEntity="Tag", inversedBy="features") + * @ORM\ManyToMany(targetEntity="Tag") * @ORM\JoinTable(name="events2tags", * joinColumns={@ORM\JoinColumn(name="events_id", referencedColumnName="id")}, * inverseJoinColumns={@ORM\JoinColumn(name="tags_id", referencedColumnName="id")} * ) */ - private $tags; + private $tags = []; /** @@ -253,7 +254,37 @@ class Event return $this->tags; } + public function hasTag(Tag $tag) { + if ($this->tags instanceof PersistentCollection) { + return $this->tags->contains($tag); + } elseif (is_array($this->tags)) { + return in_array($tag,$this->tags); + } else { + return false; + } + + } + + public function addTag(Tag $tag) { + /** @var PersistentCollection $this->tags */ + if (!$this->hasTag($tag)) { + $this->tags[] = $tag; + } + } + public function isValid() { - return false; + return true; + } + + public function getTagsAsText() { + if (count($this->tags) > 0) { + $tags = []; + foreach ($this->tags as $tag) { + $tags[] = $tag->getName(); + } + return implode(',',$tags); + } else { + return ''; + } } } diff --git a/src/Hackspace/Bundle/CalciferBundle/Entity/Location.php b/src/Hackspace/Bundle/CalciferBundle/Entity/Location.php index 66dfdb7..5720ef5 100755 --- a/src/Hackspace/Bundle/CalciferBundle/Entity/Location.php +++ b/src/Hackspace/Bundle/CalciferBundle/Entity/Location.php @@ -31,14 +31,14 @@ class Location /** * @var float * - * @ORM\Column(name="lon", type="float") + * @ORM\Column(name="lon", type="float", nullable=true) */ private $lon; /** * @var float * - * @ORM\Column(name="lat", type="float") + * @ORM\Column(name="lat", type="float", nullable=true) */ private $lat; diff --git a/src/Hackspace/Bundle/CalciferBundle/Resources/assets/css/events.scss b/src/Hackspace/Bundle/CalciferBundle/Resources/assets/css/events.scss new file mode 100755 index 0000000..8004590 --- /dev/null +++ b/src/Hackspace/Bundle/CalciferBundle/Resources/assets/css/events.scss @@ -0,0 +1,31 @@ +.event.box { + h2 { + padding: 0.5rem; + a,a:hover,a:visited { + color: #ffffff; + } + } + + .startdate,.location,.url,.edit { + /*float: left;*/ + display: inline; + margin: 0; + margin-right: 0.5rem; + margin-bottom: 0.5rem; + } + + ul.tags { + padding-left: 0; + /*float: left;*/ + margin: 0; + margin-right: 0.5rem; + margin-bottom: 0.5rem; + display: inline; + li { + list-style-type: none; + /*float: left;*/ + display: inline; + margin-right: 0.5rem; + } + } +} \ No newline at end of file diff --git a/src/Hackspace/Bundle/CalciferBundle/Resources/assets/css/jquery.datetimepicker.scss b/src/Hackspace/Bundle/CalciferBundle/Resources/assets/css/jquery.datetimepicker.scss new file mode 100755 index 0000000..097ffd5 --- /dev/null +++ b/src/Hackspace/Bundle/CalciferBundle/Resources/assets/css/jquery.datetimepicker.scss @@ -0,0 +1,366 @@ +.xdsoft_datetimepicker { + box-shadow: 0px 5px 15px -5px rgba(0, 0, 0, 0.506); + background: #FFFFFF; + border-bottom: 1px solid #BBBBBB; + border-left: 1px solid #CCCCCC; + border-right: 1px solid #CCCCCC; + border-top: 1px solid #CCCCCC; + color: #333333; + font-family: "Helvetica Neue", "Helvetica", "Arial", sans-serif; + padding: 8px; + padding-left: 0px; + padding-top: 2px; + position: absolute; + z-index: 9999; + -moz-box-sizing: border-box; + box-sizing: border-box; + display: none; +} + +.xdsoft_datetimepicker iframe { + position: absolute; + left: 0; + top: 0; + width: 75px; + height: 210px; + background: transparent; + border: none; +} + +/*For IE8 or lower*/ +.xdsoft_datetimepicker button { + border: none !important; +} + +.xdsoft_noselect { + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + -o-user-select: none; + user-select: none; +} + +.xdsoft_noselect::selection { + background: transparent; +} + +.xdsoft_noselect::-moz-selection { + background: transparent; +} + +.xdsoft_datetimepicker.xdsoft_inline { + display: inline-block; + position: static; + box-shadow: none; +} + +.xdsoft_datetimepicker * { + -moz-box-sizing: border-box; + box-sizing: border-box; + padding: 0px; + margin: 0px; +} + +.xdsoft_datetimepicker .xdsoft_datepicker, .xdsoft_datetimepicker .xdsoft_timepicker { + display: none; +} + +.xdsoft_datetimepicker .xdsoft_datepicker.active, .xdsoft_datetimepicker .xdsoft_timepicker.active { + display: block; +} + +.xdsoft_datetimepicker .xdsoft_datepicker { + width: 224px; + float: left; + margin-left: 8px; +} + +.xdsoft_datetimepicker .xdsoft_timepicker { + width: 58px; + float: left; + text-align: center; + margin-left: 8px; + margin-top: 0px; +} + +.xdsoft_datetimepicker .xdsoft_datepicker.active + .xdsoft_timepicker { + margin-top: 8px; + margin-bottom: 3px +} + +.xdsoft_datetimepicker .xdsoft_mounthpicker { + position: relative; + text-align: center; +} + +.xdsoft_datetimepicker .xdsoft_prev, .xdsoft_datetimepicker .xdsoft_next, .xdsoft_datetimepicker .xdsoft_today_button { + background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFoAAAAeCAYAAACsYQl4AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDozQjRCQjRGREU4MkNFMzExQjRDQkIyRDJDOTdBRUI1MCIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpCQjg0OUYyNTZDODAxMUUzQjMwM0IwMERBNUU0ODQ5NSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpCQjg0OUYyNDZDODAxMUUzQjMwM0IwMERBNUU0ODQ5NSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M2IChXaW5kb3dzKSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkI5NzE3MjFBN0E2Q0UzMTFBQjJEQjgzMDk5RTNBNTdBIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjNCNEJCNEZERTgyQ0UzMTFCNENCQjJEMkM5N0FFQjUwIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+aQvATgAAAfVJREFUeNrsmr1OwzAQxzGtkPjYEAuvVGAvfQIGRKADE49gdLwDDwBiZ2RhQUKwICQkWLsgFiRQuIBTucFJ/XFp4+hO+quqnZ4uvzj2nV2RpukCW/22yAgYNINmc7du7DcghCjrkqgOKjF1znpt6rZ0AGWQj7TvCU8d9UM+QAGDrhdyc2Bnc1WVVPBev9V8lBnY+rDwncWZThG4xk4lmxtJy2AHgoY/FySgbSBPwPZ8mEXbQx3aDERb0EbYAYFC7pcAtAvkMWwC0D3NX58S9D/YnoGC7nPWr3Dg9JTbtuHhDShBT8D2CBSK/iIEvVXxpuxSgh7DdgwUTL4iA92zmJb6lKB/YTsECmV+IgK947AGDIqgQ/LojsO135Hn51l2cWlov0JdGNrPUceueXRwilSVgkUyom9Rd6gbLfYTDeO+1v6orn0InTogYDGUkYLO3/wc9BdqqTCKP1Tfi+oTIaCBIL2TES+GTyruT9S61p6BHam+99DFEAgLFklYsIBHwSI9QY80H5ta+1rB/6ovaKihBJeEJbgLbBlQgl+j3lDPqA2tfQV1j3pVn8s+oKHGTSVJ+FqDLeR5bCqJ2E/BCycsoLZETXaKGs7rhKVt+9HZScrZNMi88V8P7LlDbvOZYaJVpMMmBCT4n0o8dTBoNgbdWPsRYACs3r7XyNfbnAAAAABJRU5ErkJggg=='); +} + +.xdsoft_datetimepicker .xdsoft_prev { + float: left; + background-position: -20px 0px; +} + +.xdsoft_datetimepicker .xdsoft_today_button { + float: left; + background-position: -70px 0px; + margin-left: 5px; +} + +.xdsoft_datetimepicker .xdsoft_next { + float: right; + background-position: 0px 0px; +} + +.xdsoft_datetimepicker .xdsoft_next:active, .xdsoft_datetimepicker .xdsoft_prev:active { +} + +.xdsoft_datetimepicker .xdsoft_next, .xdsoft_datetimepicker .xdsoft_prev, .xdsoft_datetimepicker .xdsoft_today_button { + background-color: transparent; + background-repeat: no-repeat; + border: 0px none currentColor; + cursor: pointer; + display: block; + height: 30px; + opacity: 0.5; + outline: medium none currentColor; + overflow: hidden; + padding: 0px; + position: relative; + text-indent: 100%; + white-space: nowrap; + width: 20px; +} + +.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_prev, +.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_next { + float: none; + background-position: -40px -15px; + height: 15px; + width: 30px; + display: block; + margin-left: 14px; + margin-top: 7px; +} + +.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_prev { + background-position: -40px 0px; + margin-bottom: 7px; + margin-top: 0px; +} + +.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_time_box { + height: 151px; + overflow: hidden; + border-bottom: 1px solid #DDDDDD; +} + +.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_time_box > div > div { + background: #F5F5F5; + border-top: 1px solid #DDDDDD; + color: #666666; + font-size: 12px; + text-align: center; + border-collapse: collapse; + cursor: pointer; + border-bottom-width: 0px; + height: 25px; + line-height: 25px; +} + +.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_time_box > div > div:first-child { + border-top-width: 0px; +} + +.xdsoft_datetimepicker .xdsoft_today_button:hover, +.xdsoft_datetimepicker .xdsoft_next:hover, +.xdsoft_datetimepicker .xdsoft_prev:hover { + opacity: 1; +} + +.xdsoft_datetimepicker .xdsoft_label { + display: inline; + position: relative; + z-index: 9999; + margin: 0; + padding: 5px 3px; + font-size: 14px; + line-height: 20px; + font-weight: bold; + background-color: #fff; + float: left; + width: 182px; + text-align: center; + cursor: pointer; +} + +.xdsoft_datetimepicker .xdsoft_label:hover { + text-decoration: underline; +} + +.xdsoft_datetimepicker .xdsoft_label > .xdsoft_select { + border: 1px solid #ccc; + position: absolute; + right: 0px; + top: 30px; + z-index: 101; + display: none; + background: #fff; + max-height: 160px; + overflow-y: hidden; +} + +.xdsoft_datetimepicker .xdsoft_label > .xdsoft_select.xdsoft_monthselect { + right: -7px; +} + +.xdsoft_datetimepicker .xdsoft_label > .xdsoft_select.xdsoft_yearselect { + right: 2px; +} + +.xdsoft_datetimepicker .xdsoft_label > .xdsoft_select > div > .xdsoft_option:hover { + color: #fff; + background: #ff8000; +} + +.xdsoft_datetimepicker .xdsoft_label > .xdsoft_select > div > .xdsoft_option { + padding: 2px 10px 2px 5px; +} + +.xdsoft_datetimepicker .xdsoft_label > .xdsoft_select > div > .xdsoft_option.xdsoft_current { + background: #33AAFF; + box-shadow: #178FE5 0px 1px 3px 0px inset; + color: #fff; + font-weight: 700; +} + +.xdsoft_datetimepicker .xdsoft_month { + width: 90px; + text-align: right; +} + +.xdsoft_datetimepicker .xdsoft_calendar { + clear: both; +} + +.xdsoft_datetimepicker .xdsoft_year { + width: 56px; +} + +.xdsoft_datetimepicker .xdsoft_calendar table { + border-collapse: collapse; + width: 100%; + +} + +.xdsoft_datetimepicker .xdsoft_calendar td > div { + padding-right: 5px; +} + +.xdsoft_datetimepicker .xdsoft_calendar th { + height: 25px; +} + +.xdsoft_datetimepicker .xdsoft_calendar td, .xdsoft_datetimepicker .xdsoft_calendar th { + width: 14.2857142%; + background: #F5F5F5; + border: 1px solid #DDDDDD; + color: #666666; + font-size: 12px; + text-align: right; + padding: 0px; + border-collapse: collapse; + cursor: pointer; + height: 25px; +} + +.xdsoft_datetimepicker .xdsoft_calendar th { + background: #F1F1F1; +} + +.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_today { + color: #33AAFF; +} + +.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_default, +.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_current, +.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_time_box > div > div.xdsoft_current { + background: #33AAFF; + box-shadow: #178FE5 0px 1px 3px 0px inset; + color: #fff; + font-weight: 700; +} + +.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_other_month, +.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_disabled, +.xdsoft_datetimepicker .xdsoft_time_box > div > div.xdsoft_disabled { + opacity: 0.5; +} + +.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_other_month.xdsoft_disabled { + opacity: 0.2; +} + +.xdsoft_datetimepicker .xdsoft_calendar td:hover, +.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_time_box > div > div:hover { + color: #fff !important; + background: #ff8000 !important; + box-shadow: none !important; +} + +.xdsoft_datetimepicker .xdsoft_calendar td.xdsoft_disabled:hover, +.xdsoft_datetimepicker .xdsoft_timepicker .xdsoft_time_box > div > div.xdsoft_disabled:hover { + color: inherit !important; + background: inherit !important; + /*box-shadow: inherit !important;*/ +} + +.xdsoft_datetimepicker .xdsoft_calendar th { + font-weight: 700; + text-align: center; + color: #999; + cursor: default; +} + +.xdsoft_datetimepicker .xdsoft_copyright { + color: #ccc !important; + font-size: 10px; + clear: both; + float: none; + margin-left: 8px; +} + +.xdsoft_datetimepicker .xdsoft_copyright a { + color: #eee !important; +} + +.xdsoft_datetimepicker .xdsoft_copyright a:hover { + color: #aaa !important; +} + +.xdsoft_time_box { + position: relative; + border: 1px solid #ccc; +} + +.xdsoft_scrollbar > .xdsoft_scroller { + background: #ccc !important; + height: 20px; + border-radius: 3px; +} + +.xdsoft_scrollbar { + position: absolute; + width: 7px; + right: 0px; + top: 0px; + bottom: 0px; + cursor: pointer; +} + +.xdsoft_scroller_box { + position: relative; +} diff --git a/src/Hackspace/Bundle/CalciferBundle/Resources/assets/js/events.js b/src/Hackspace/Bundle/CalciferBundle/Resources/assets/js/events.js new file mode 100755 index 0000000..b345f23 --- /dev/null +++ b/src/Hackspace/Bundle/CalciferBundle/Resources/assets/js/events.js @@ -0,0 +1,10 @@ +/** + * Created by tim on 06.07.14. + */ + +// initializing with settings + +$(document).ready(function () { + $('.icon.link').popup(); + jQuery('input[type=datetime]').datetimepicker({lang: 'de',format:'Y-m-d H:i'}); +}); diff --git a/src/Hackspace/Bundle/CalciferBundle/Resources/assets/js/jquery.datetimepicker.js b/src/Hackspace/Bundle/CalciferBundle/Resources/assets/js/jquery.datetimepicker.js new file mode 100644 index 0000000..4fcbe4b --- /dev/null +++ b/src/Hackspace/Bundle/CalciferBundle/Resources/assets/js/jquery.datetimepicker.js @@ -0,0 +1,1415 @@ +/** + * @preserve jQuery DateTimePicker plugin v2.3.0 + * @homepage http://xdsoft.net/jqplugins/datetimepicker/ + * (c) 2014, Chupurnov Valeriy. + */ +(function( $ ) { + 'use strict'; + var default_options = { + i18n:{ + bg:{ // Bulgarian + months:[ + "Януари", "Февруари", "Март", "Април", "Май", "Юни", "Юли", "Август", "Септември", "Октомври", "Ноември", "Декември" + ], + dayOfWeek:[ + "Нд", "Пн", "Вт", "Ср", "Чт", "Пт", "Сб" + ] + }, + fa:{ // Persian/Farsi + months:[ + 'فروردین', 'اردیبهشت', 'خرداد', 'تیر', 'مرداد', 'شهریور', 'مهر', 'آبان', 'آذر', 'دی', 'بهمن', 'اسفند' + ], + dayOfWeek:[ + 'یکشنبه', 'دوشنبه', 'سه شنبه', 'چهارشنبه', 'پنجشنبه', 'جمعه', 'شنبه' + ] + }, + ru:{ // Russian + months:[ + 'Январь','Февраль','Март','Апрель','Май','Июнь','Июль','Август','Сентябрь','Октябрь','Ноябрь','Декабрь' + ], + dayOfWeek:[ + "Вск", "Пн", "Вт", "Ср", "Чт", "Пт", "Сб" + ] + }, + en:{ // English + months: [ + "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" + ], + dayOfWeek: [ + "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" + ] + }, + el:{ // Ελληνικά + months: [ + "Ιανουάριος", "Φεβρουάριος", "Μάρτιος", "Απρίλιος", "Μάιος", "Ιούνιος", "Ιούλιος", "Αύγουστος", "Σεπτέμβριος", "Οκτώβριος", "Νοέμβριος", "Δεκέμβριος" + ], + dayOfWeek: [ + "Κυρ", "Δευ", "Τρι", "Τετ", "Πεμ", "Παρ", "Σαβ" + ] + }, + de:{ // German + months:[ + 'Januar','Februar','März','April','Mai','Juni','Juli','August','September','Oktober','November','Dezember' + ], + dayOfWeek:[ + "So", "Mo", "Di", "Mi", "Do", "Fr", "Sa" + ] + }, + nl:{ // Dutch + months:[ + "januari", "februari", "maart", "april", "mei", "juni", "juli", "augustus", "september", "oktober", "november", "december" + ], + dayOfWeek:[ + "zo", "ma", "di", "wo", "do", "vr", "za" + ] + }, + tr:{ // Turkish + months:[ + "Ocak", "Şubat", "Mart", "Nisan", "Mayıs", "Haziran", "Temmuz", "Ağustos", "Eylül", "Ekim", "Kasım", "Aralık" + ], + dayOfWeek:[ + "Paz", "Pts", "Sal", "Çar", "Per", "Cum", "Cts" + ] + }, + fr:{ //French + months:[ + "Janvier", "Février", "Mars", "Avril", "Mai", "Juin", "Juillet", "Août", "Septembre", "Octobre", "Novembre", "Décembre" + ], + dayOfWeek:[ + "Dim", "Lun", "Mar", "Mer", "Jeu", "Ven", "Sam" + ] + }, + es:{ // Spanish + months: [ + "Enero", "Febrero", "Marzo", "Abril", "Mayo", "Junio", "Julio", "Agosto", "Septiembre", "Octubre", "Noviembre", "Diciembre" + ], + dayOfWeek: [ + "Dom", "Lun", "Mar", "Mié", "Jue", "Vie", "Sáb" + ] + }, + th:{ // Thai + months:[ + 'มกราคม','กุมภาพันธ์','มีนาคม','เมษายน','พฤษภาคม','มิถุนายน','กรกฎาคม','สิงหาคม','กันยายน','ตุลาคม','พฤศจิกายน','ธันวาคม' + ], + dayOfWeek:[ + 'อา.','จ.','อ.','พ.','พฤ.','ศ.','ส.' + ] + }, + pl:{ // Polish + months: [ + "styczeń", "luty", "marzec", "kwiecień", "maj", "czerwiec", "lipiec", "sierpień", "wrzesień", "październik", "listopad", "grudzień" + ], + dayOfWeek: [ + "nd", "pn", "wt", "śr", "cz", "pt", "sb" + ] + }, + pt:{ // Portuguese + months: [ + "Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro" + ], + dayOfWeek: [ + "Dom", "Seg", "Ter", "Qua", "Qui", "Sex", "Sab" + ] + }, + ch:{ // Simplified Chinese + months: [ + "一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月" + ], + dayOfWeek: [ + "日", "一","二","三","四","五","六" + ] + }, + se:{ // Swedish + months: [ + "Januari", "Februari", "Mars", "April", "Maj", "Juni", "Juli", "Augusti", "September","Oktober", "November", "December" + ], + dayOfWeek: [ + "Sön", "Mån", "Tis", "Ons", "Tor", "Fre", "Lör" + ] + }, + kr:{ // Korean + months: [ + "1월", "2월", "3월", "4월", "5월", "6월", "7월", "8월", "9월", "10월", "11월", "12월" + ], + dayOfWeek: [ + "일", "월", "화", "수", "목", "금", "토" + ] + }, + it:{ // Italian + months: [ + "Gennaio", "Febbraio", "Marzo", "Aprile", "Maggio", "Giugno", "Luglio", "Agosto", "Settembre", "Ottobre", "Novembre", "Dicembre" + ], + dayOfWeek: [ + "Dom", "Lun", "Mar", "Mer", "Gio", "Ven", "Sab" + ] + }, + da:{ // Dansk + months: [ + "January", "Februar", "Marts", "April", "Maj", "Juni", "July", "August", "September", "Oktober", "November", "December" + ], + dayOfWeek: [ + "Søn", "Man", "Tir", "ons", "Tor", "Fre", "lør" + ] + }, + no:{ // Norwegian + months: [ + "Januar", "Februar", "Mars", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Desember" + ], + dayOfWeek: [ + "Søn", "Man", "Tir", "Ons", "Tor", "Fre", "Lør" + ] + }, + ja:{ // Japanese + months: [ + "1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月" + ], + dayOfWeek: [ + "日", "月", "火", "水", "木", "金", "土" + ] + }, + vi:{ // Vietnamese + months: [ + "Tháng 1", "Tháng 2", "Tháng 3", "Tháng 4", "Tháng 5", "Tháng 6", "Tháng 7", "Tháng 8", "Tháng 9", "Tháng 10", "Tháng 11", "Tháng 12" + ], + dayOfWeek: [ + "CN", "T2", "T3", "T4", "T5", "T6", "T7" + ] + }, + sl:{ // Slovenščina + months: [ + "Januar", "Februar", "Marec", "April", "Maj", "Junij", "Julij", "Avgust", "September", "Oktober", "November", "December" + ], + dayOfWeek: [ + "Ned", "Pon", "Tor", "Sre", "Čet", "Pet", "Sob" + ] + }, + cs:{ // Čeština + months: [ + "Leden", "Únor", "Březen", "Duben", "Květen", "Červen", "Červenec", "Srpen", "Září", "Říjen", "Listopad", "Prosinec" + ], + dayOfWeek: [ + "Ne", "Po", "Út", "St", "Čt", "Pá", "So" + ] + }, + hu:{ // Hungarian + months: [ + "Január", "Február", "Március", "Április", "Május", "Június", "Július", "Augusztus", "Szeptember", "Október", "November", "December" + ], + dayOfWeek: [ + "Va", "Hé", "Ke", "Sze", "Cs", "Pé", "Szo" + ] + } + }, + value:'', + lang:'en', + + format: 'Y/m/d H:i', + formatTime: 'H:i', + formatDate: 'Y/m/d', + + startDate: false, // new Date(), '1986/12/08', '-1970/01/05','-1970/01/05', + + step:60, + monthChangeSpinner:true, + closeOnDateSelect:false, + closeOnWithoutClick:true, + closeOnInputClick: true, + + timepicker:true, + datepicker:true, + + minDate:false, + maxDate:false, + minTime:false, + maxTime:false, + + allowTimes:[], + opened:false, + initTime:true, + inline:false, + + onSelectDate:function() {}, + onSelectTime:function() {}, + onChangeMonth:function() {}, + onChangeDateTime:function() {}, + onShow:function() {}, + onClose:function() {}, + onGenerate:function() {}, + + withoutCopyright:true, + + inverseButton:false, + hours12:false, + next: 'xdsoft_next', + prev : 'xdsoft_prev', + dayOfWeekStart:0, + + timeHeightInTimePicker:25, + timepickerScrollbar:true, + + todayButton:true, // 2.1.0 + defaultSelect:true, // 2.1.0 + + scrollMonth:true, + scrollTime:true, + scrollInput:true, + + lazyInit:false, + + mask:false, + validateOnBlur:true, + allowBlank:true, + + yearStart:1950, + yearEnd:2050, + + style:'', + id:'', + + fixed: false, + + roundTime:'round', // ceil, floor + className:'', + + weekends : [], + yearOffset:0, + beforeShowDay: null + }; + + // fix for ie8 + if ( !Array.prototype.indexOf ) { + Array.prototype.indexOf = function(obj, start) { + for (var i = (start || 0), j = this.length; i < j; i++) { + if (this[i] === obj) { return i; } + } + return -1; + } + } + + Date.prototype.countDaysInMonth = function(){ + return new Date(this.getFullYear(), this.getMonth()+1, 0).getDate(); + }; + + $.fn.xdsoftScroller = function( _percent ) { + return this.each(function() { + var timeboxparent = $(this); + if( !$(this).hasClass('xdsoft_scroller_box') ) { + var pointerEventToXY = function( e ) { + var out = {x:0, y:0}; + if( e.type == 'touchstart' || e.type == 'touchmove' || e.type == 'touchend' || e.type == 'touchcancel' ) { + var touch = e.originalEvent.touches[0] || e.originalEvent.changedTouches[0]; + out.x = touch.pageX; + out.y = touch.pageY; + }else if (e.type == 'mousedown' || e.type == 'mouseup' || e.type == 'mousemove' || e.type == 'mouseover'|| e.type=='mouseout' || e.type=='mouseenter' || e.type=='mouseleave') { + out.x = e.pageX; + out.y = e.pageY; + } + return out; + }, + move = 0, + timebox = timeboxparent.children().eq(0), + parentHeight = timeboxparent[0].clientHeight, + height = timebox[0].offsetHeight, + scrollbar = $('
'), + scroller = $('
'), + maximumOffset = 100, + start = false; + + scrollbar.append(scroller); + + timeboxparent.addClass('xdsoft_scroller_box').append(scrollbar); + scroller.on('mousedown.xdsoft_scroller',function ( event ) { + if( !parentHeight ) + timeboxparent.trigger('resize_scroll.xdsoft_scroller',[_percent]); + var pageY = event.pageY, + top = parseInt(scroller.css('margin-top')), + h1 = scrollbar[0].offsetHeight; + $(document.body).addClass('xdsoft_noselect'); + $([document.body,window]).on('mouseup.xdsoft_scroller',function arguments_callee() { + $([document.body,window]).off('mouseup.xdsoft_scroller',arguments_callee) + .off('mousemove.xdsoft_scroller',move) + .removeClass('xdsoft_noselect'); + }); + $(document.body).on('mousemove.xdsoft_scroller',move = function(event) { + var offset = event.pageY-pageY+top; + if( offset<0 ) + offset = 0; + if( offset+scroller[0].offsetHeight>h1 ) + offset = h1-scroller[0].offsetHeight; + timeboxparent.trigger('scroll_element.xdsoft_scroller',[maximumOffset?offset/maximumOffset:0]); + }); + }); + + timeboxparent + .on('scroll_element.xdsoft_scroller',function( event,percent ) { + if( !parentHeight ) + timeboxparent.trigger('resize_scroll.xdsoft_scroller',[percent,true]); + percent = percent>1?1:(percent<0||isNaN(percent))?0:percent; + scroller.css('margin-top',maximumOffset*percent); + timebox.css('marginTop',-parseInt((height-parentHeight)*percent)) + }) + .on('resize_scroll.xdsoft_scroller',function( event,_percent,noTriggerScroll ) { + parentHeight = timeboxparent[0].clientHeight; + height = timebox[0].offsetHeight; + var percent = parentHeight/height, + sh = percent*scrollbar[0].offsetHeight; + if( percent>1 ) + scroller.hide(); + else{ + scroller.show(); + scroller.css('height',parseInt(sh>10?sh:10)); + maximumOffset = scrollbar[0].offsetHeight-scroller[0].offsetHeight; + if( noTriggerScroll!==true ) + timeboxparent.trigger('scroll_element.xdsoft_scroller',[_percent?_percent:Math.abs(parseInt(timebox.css('marginTop')))/(height-parentHeight)]); + } + }); + timeboxparent.mousewheel&&timeboxparent.mousewheel(function(event, delta, deltaX, deltaY) { + var top = Math.abs(parseInt(timebox.css('marginTop'))); + timeboxparent.trigger('scroll_element.xdsoft_scroller',[(top-delta*20)/(height-parentHeight)]); + event.stopPropagation(); + return false; + }); + timeboxparent.on('touchstart',function( event ) { + start = pointerEventToXY(event); + }); + timeboxparent.on('touchmove',function( event ) { + if( start ) { + var coord = pointerEventToXY(event), top = Math.abs(parseInt(timebox.css('marginTop'))); + timeboxparent.trigger('scroll_element.xdsoft_scroller',[(top-(coord.y-start.y))/(height-parentHeight)]); + event.stopPropagation(); + event.preventDefault(); + start = pointerEventToXY(event); + } + }); + timeboxparent.on('touchend touchcancel',function( event ) { + start = false; + }); + } + timeboxparent.trigger('resize_scroll.xdsoft_scroller',[_percent]); + }); + }; + $.fn.datetimepicker = function( opt ) { + var KEY0 = 48, + KEY9 = 57, + _KEY0 = 96, + _KEY9 = 105, + CTRLKEY = 17, + DEL = 46, + ENTER = 13, + ESC = 27, + BACKSPACE = 8, + ARROWLEFT = 37, + ARROWUP = 38, + ARROWRIGHT = 39, + ARROWDOWN = 40, + TAB = 9, + F5 = 116, + AKEY = 65, + CKEY = 67, + VKEY = 86, + ZKEY = 90, + YKEY = 89, + ctrlDown = false, + options = ($.isPlainObject(opt)||!opt)?$.extend(true,{},default_options,opt):$.extend({},default_options), + + lazyInitTimer = 0, + + lazyInit = function( input ){ + input + .on('open.xdsoft focusin.xdsoft mousedown.xdsoft',function initOnActionCallback(event) { + if( input.is(':disabled')||input.is(':hidden')||!input.is(':visible')||input.data( 'xdsoft_datetimepicker') ) + return; + + clearTimeout(lazyInitTimer); + + lazyInitTimer = setTimeout(function() { + + if( !input.data( 'xdsoft_datetimepicker') ) + createDateTimePicker(input); + + input + .off('open.xdsoft focusin.xdsoft mousedown.xdsoft',initOnActionCallback) + .trigger('open.xdsoft'); + },100); + + }); + }, + + createDateTimePicker = function( input ) { + + var datetimepicker = $('
'), + xdsoft_copyright = $('
xdsoft.net
'), + datepicker = $('
'), + mounth_picker = $('
'), + calendar = $('
'), + timepicker = $('
'), + timeboxparent = timepicker.find('.xdsoft_time_box').eq(0), + timebox = $('
'), + scrollbar = $('
'), + scroller = $('
'), + monthselect =$('
'), + yearselect =$('
'); + + //constructor lego + mounth_picker + .find('.xdsoft_month span') + .after(monthselect); + mounth_picker + .find('.xdsoft_year span') + .after(yearselect); + + mounth_picker + .find('.xdsoft_month,.xdsoft_year') + .on('mousedown.xdsoft',function(event) { + mounth_picker + .find('.xdsoft_select') + .hide(); + + var select = $(this).find('.xdsoft_select').eq(0), + val = 0, + top = 0; + + if( _xdsoft_datetime.currentTime ) + val = _xdsoft_datetime.currentTime[$(this).hasClass('xdsoft_month')?'getMonth':'getFullYear'](); + + select.show(); + + for(var items = select.find('div.xdsoft_option'),i = 0;i6 ) + options.dayOfWeekStart = 0; + else + options.dayOfWeekStart = parseInt(options.dayOfWeekStart); + + if( !options.timepickerScrollbar ) + scrollbar.hide(); + + if( options.minDate && /^-(.*)$/.test(options.minDate) ){ + options.minDate = _xdsoft_datetime.strToDateTime(options.minDate).dateFormat( options.formatDate ); + } + + if( options.maxDate && /^\+(.*)$/.test(options.maxDate) ) { + options.maxDate = _xdsoft_datetime.strToDateTime(options.maxDate).dateFormat( options.formatDate ); + } + + mounth_picker + .find('.xdsoft_today_button') + .css('visibility',!options.todayButton?'hidden':'visible'); + + if( options.mask ) { + var e, + getCaretPos = function ( input ) { + try{ + if ( document.selection && document.selection.createRange ) { + var range = document.selection.createRange(); + return range.getBookmark().charCodeAt(2) - 2; + }else + if ( input.setSelectionRange ) + return input.selectionStart; + }catch(e) { + return 0; + } + }, + setCaretPos = function ( node,pos ) { + node = (typeof node == "string" || node instanceof String) ? document.getElementById(node) : node; + if(!node) { + return false; + }else if(node.createTextRange) { + var textRange = node.createTextRange(); + textRange.collapse(true); + textRange.moveEnd(pos); + textRange.moveStart(pos); + textRange.select(); + return true; + }else if(node.setSelectionRange) { + node.setSelectionRange(pos,pos); + return true; + } + return false; + }, + isValidValue = function ( mask,value ) { + var reg = mask + .replace(/([\[\]\/\{\}\(\)\-\.\+]{1})/g,'\\$1') + .replace(/_/g,'{digit+}') + .replace(/([0-9]{1})/g,'{digit$1}') + .replace(/\{digit([0-9]{1})\}/g,'[0-$1_]{1}') + .replace(/\{digit[\+]\}/g,'[0-9_]{1}'); + return RegExp(reg).test(value); + }; + input.off('keydown.xdsoft'); + switch(true) { + case ( options.mask===true ): + + options.mask = options.format + .replace(/Y/g,'9999') + .replace(/F/g,'9999') + .replace(/m/g,'19') + .replace(/d/g,'39') + .replace(/H/g,'29') + .replace(/i/g,'59') + .replace(/s/g,'59'); + + case ( $.type(options.mask) == 'string' ): + + if( !isValidValue( options.mask,input.val() ) ) + input.val(options.mask.replace(/[0-9]/g,'_')); + + input.on('keydown.xdsoft',function( event ) { + var val = this.value, + key = event.which; + + switch(true) { + case (( key>=KEY0&&key<=KEY9 )||( key>=_KEY0&&key<=_KEY9 ))||(key==BACKSPACE||key==DEL): + var pos = getCaretPos(this), + digit = ( key!=BACKSPACE&&key!=DEL )?String.fromCharCode((_KEY0 <= key && key <= _KEY9)? key-KEY0 : key):'_'; + + if( (key==BACKSPACE||key==DEL)&&pos ) { + pos--; + digit='_'; + } + + while( /[^0-9_]/.test(options.mask.substr(pos,1))&&pos0 ) + pos+=( key==BACKSPACE||key==DEL )?-1:1; + + val = val.substr(0,pos)+digit+val.substr(pos+1); + if( $.trim(val)=='' ){ + val = options.mask.replace(/[0-9]/g,'_'); + }else{ + if( pos==options.mask.length ) + break; + } + + pos+=(key==BACKSPACE||key==DEL)?0:1; + while( /[^0-9_]/.test(options.mask.substr(pos,1))&&pos0 ) + pos+=(key==BACKSPACE||key==DEL)?-1:1; + + if( isValidValue( options.mask,val ) ) { + this.value = val; + setCaretPos(this,pos); + }else if( $.trim(val)=='' ) + this.value = options.mask.replace(/[0-9]/g,'_'); + else{ + input.trigger('error_input.xdsoft'); + } + break; + case ( !!~([AKEY,CKEY,VKEY,ZKEY,YKEY].indexOf(key))&&ctrlDown ): + case !!~([ESC,ARROWUP,ARROWDOWN,ARROWLEFT,ARROWRIGHT,F5,CTRLKEY,TAB,ENTER].indexOf(key)): + return true; + } + event.preventDefault(); + return false; + }); + break; + } + } + if( options.validateOnBlur ) { + input + .off('blur.xdsoft') + .on('blur.xdsoft', function() { + if( options.allowBlank && !$.trim($(this).val()).length ) { + $(this).val(null); + datetimepicker.data('xdsoft_datetime').empty(); + }else if( !Date.parseDate( $(this).val(), options.format ) ) { + $(this).val((_xdsoft_datetime.now()).dateFormat( options.format )); + datetimepicker.data('xdsoft_datetime').setCurrentTime($(this).val()); + } + else{ + datetimepicker.data('xdsoft_datetime').setCurrentTime($(this).val()); + } + datetimepicker.trigger('changedatetime.xdsoft'); + }); + } + options.dayOfWeekStartPrev = (options.dayOfWeekStart==0)?6:options.dayOfWeekStart-1; + + datetimepicker + .trigger('xchange.xdsoft') + .trigger('afterOpen.xdsoft') + }; + + datetimepicker + .data('options',options) + .on('mousedown.xdsoft',function( event ) { + event.stopPropagation(); + event.preventDefault(); + yearselect.hide(); + monthselect.hide(); + return false; + }); + + var scroll_element = timepicker.find('.xdsoft_time_box'); + scroll_element.append(timebox); + scroll_element.xdsoftScroller(); + + datetimepicker.on('afterOpen.xdsoft',function() { + scroll_element.xdsoftScroller(); + }); + + datetimepicker + .append(datepicker) + .append(timepicker); + + if( options.withoutCopyright!==true ) + datetimepicker + .append(xdsoft_copyright); + + datepicker + .append(mounth_picker) + .append(calendar); + + $('body').append(datetimepicker); + + var _xdsoft_datetime = new function() { + var _this = this; + _this.now = function() { + var d = new Date(); + if( options.yearOffset ) + d.setFullYear(d.getFullYear()+options.yearOffset); + return d; + }; + + _this.currentTime = this.now(); + _this.isValidDate = function (d) { + if ( Object.prototype.toString.call(d) !== "[object Date]" ) + return false; + return !isNaN(d.getTime()); + }; + + _this.setCurrentTime = function( dTime) { + _this.currentTime = (typeof dTime == 'string')? _this.strToDateTime(dTime) : _this.isValidDate(dTime) ? dTime: _this.now(); + datetimepicker.trigger('xchange.xdsoft'); + }; + + _this.empty = function() { + _this.currentTime = null; + }; + + _this.getCurrentTime = function( dTime) { + return _this.currentTime; + }; + + _this.nextMonth = function() { + var month = _this.currentTime.getMonth()+1; + if( month==12 ) { + _this.currentTime.setFullYear(_this.currentTime.getFullYear()+1); + month = 0; + } + _this.currentTime.setDate( + Math.min( + Date.daysInMonth[month], + _this.currentTime.getDate() + ) + ); + _this.currentTime.setMonth(month); + options.onChangeMonth&&options.onChangeMonth.call&&options.onChangeMonth.call(datetimepicker,_xdsoft_datetime.currentTime,datetimepicker.data('input')); + datetimepicker.trigger('xchange.xdsoft'); + return month; + }; + + _this.prevMonth = function() { + var month = _this.currentTime.getMonth()-1; + if( month==-1 ) { + _this.currentTime.setFullYear(_this.currentTime.getFullYear()-1); + month = 11; + } + _this.currentTime.setDate( + Math.min( + Date.daysInMonth[month], + _this.currentTime.getDate() + ) + ); + _this.currentTime.setMonth(month); + options.onChangeMonth&&options.onChangeMonth.call&&options.onChangeMonth.call(datetimepicker,_xdsoft_datetime.currentTime,datetimepicker.data('input')); + datetimepicker.trigger('xchange.xdsoft'); + return month; + }; + + _this.strToDateTime = function( sDateTime ) { + if( sDateTime && sDateTime instanceof Date && _this.isValidDate(sDateTime) ) + return sDateTime; + + var tmpDate = [],timeOffset,currentTime; + + if( ( tmpDate = /^(\+|\-)(.*)$/.exec(sDateTime) ) && ( tmpDate[2]=Date.parseDate(tmpDate[2], options.formatDate) ) ) { + timeOffset = tmpDate[2].getTime()-(tmpDate[2].getTimezoneOffset())*60000; + currentTime = new Date((_xdsoft_datetime.now()).getTime()+parseInt(tmpDate[1]+'1')*timeOffset); + }else + currentTime = sDateTime?Date.parseDate(sDateTime, options.format):_this.now(); + + if( !_this.isValidDate(currentTime) ) + currentTime = _this.now(); + + return currentTime; + }; + + _this.strtodate = function( sDate ) { + if( sDate && sDate instanceof Date && _this.isValidDate(sDate) ) + return sDate; + + var currentTime = sDate?Date.parseDate(sDate, options.formatDate):_this.now(); + if( !_this.isValidDate(currentTime) ) + currentTime = _this.now(); + + return currentTime; + }; + + _this.strtotime = function( sTime ) { + if( sTime && sTime instanceof Date && _this.isValidDate(sTime) ) + return sTime; + + var currentTime = sTime?Date.parseDate(sTime, options.formatTime):_this.now(); + if( !_this.isValidDate(currentTime) ) + currentTime = _this.now(); + + return currentTime; + }; + + _this.str = function() { + return _this.currentTime.dateFormat(options.format); + }; + }; + mounth_picker + .find('.xdsoft_today_button') + .on('mousedown.xdsoft',function() { + datetimepicker.data('changed',true); + _xdsoft_datetime.setCurrentTime(0); + datetimepicker.trigger('afterOpen.xdsoft'); + }).on('dblclick.xdsoft',function(){ + input.val( _xdsoft_datetime.str() ); + datetimepicker.trigger('close.xdsoft'); + }); + mounth_picker + .find('.xdsoft_prev,.xdsoft_next') + .on('mousedown.xdsoft',function() { + var $this = $(this), + timer = 0, + stop = false; + + (function arguments_callee1(v) { + var month = _xdsoft_datetime.currentTime.getMonth(); + if( $this.hasClass( options.next ) ) { + _xdsoft_datetime.nextMonth(); + }else if( $this.hasClass( options.prev ) ) { + _xdsoft_datetime.prevMonth(); + } + if (options.monthChangeSpinner) { + !stop&&(timer = setTimeout(arguments_callee1,v?v:100)); + } + })(500); + + $([document.body,window]).on('mouseup.xdsoft',function arguments_callee2() { + clearTimeout(timer); + stop = true; + $([document.body,window]).off('mouseup.xdsoft',arguments_callee2); + }); + }); + + timepicker + .find('.xdsoft_prev,.xdsoft_next') + .on('mousedown.xdsoft',function() { + var $this = $(this), + timer = 0, + stop = false, + period = 110; + (function arguments_callee4(v) { + var pheight = timeboxparent[0].clientHeight, + height = timebox[0].offsetHeight, + top = Math.abs(parseInt(timebox.css('marginTop'))); + if( $this.hasClass(options.next) && (height-pheight)- options.timeHeightInTimePicker>=top ) { + timebox.css('marginTop','-'+(top+options.timeHeightInTimePicker)+'px') + }else if( $this.hasClass(options.prev) && top-options.timeHeightInTimePicker>=0 ) { + timebox.css('marginTop','-'+(top-options.timeHeightInTimePicker)+'px') + } + timeboxparent.trigger('scroll_element.xdsoft_scroller',[Math.abs(parseInt(timebox.css('marginTop'))/(height-pheight))]); + period= ( period>10 )?10:period-10; + !stop&&(timer = setTimeout(arguments_callee4,v?v:period)); + })(500); + $([document.body,window]).on('mouseup.xdsoft',function arguments_callee5() { + clearTimeout(timer); + stop = true; + $([document.body,window]) + .off('mouseup.xdsoft',arguments_callee5); + }); + }); + + var xchangeTimer = 0; + // base handler - generating a calendar and timepicker + datetimepicker + .on('xchange.xdsoft',function( event ) { + clearTimeout(xchangeTimer); + xchangeTimer = setTimeout(function(){ + var table = '', + start = new Date(_xdsoft_datetime.currentTime.getFullYear(),_xdsoft_datetime.currentTime.getMonth(),1, 12, 0, 0), + i = 0, + today = _xdsoft_datetime.now(); + + while( start.getDay()!=options.dayOfWeekStart ) + start.setDate(start.getDate()-1); + + //generate calendar + table+=''; + + // days + for(var j = 0; j<7; j++) { + table+=''; + } + + table+=''; + table+=''; + var maxDate = false, minDate = false; + + if( options.maxDate!==false ) { + maxDate = _xdsoft_datetime.strtodate(options.maxDate); + maxDate = new Date(maxDate.getFullYear(),maxDate.getMonth(),maxDate.getDate(),23,59,59,999); + } + + if( options.minDate!==false ) { + minDate = _xdsoft_datetime.strtodate(options.minDate); + minDate = new Date(minDate.getFullYear(),minDate.getMonth(),minDate.getDate()); + } + + var d,y,m,classes = [],customDateSettings; + + while( i<_xdsoft_datetime.currentTime.countDaysInMonth()||start.getDay()!=options.dayOfWeekStart||_xdsoft_datetime.currentTime.getMonth()==start.getMonth() ) { + classes = []; + i++; + + d = start.getDate(); y = start.getFullYear(); m = start.getMonth(); + + classes.push('xdsoft_date'); + + if ( options.beforeShowDay && options.beforeShowDay.call ) { + customDateSettings = options.beforeShowDay.call(datetimepicker, start); + } else { + customDateSettings = null; + } + + if( ( maxDate!==false && start > maxDate )||( minDate!==false && start < minDate )||(customDateSettings && customDateSettings[0] === false) ){ + classes.push('xdsoft_disabled'); + } + + if ( customDateSettings && customDateSettings[1] != "" ) { + classes.push(customDateSettings[1]); + } + + if( _xdsoft_datetime.currentTime.getMonth()!=m ) classes.push('xdsoft_other_month'); + + if( (options.defaultSelect||datetimepicker.data('changed')) && _xdsoft_datetime.currentTime.dateFormat( options.formatDate )==start.dateFormat( options.formatDate ) ) { + classes.push('xdsoft_current'); + } + + if( today.dateFormat( options.formatDate )==start.dateFormat( options.formatDate ) ) { + classes.push('xdsoft_today'); + } + + if( start.getDay()==0||start.getDay()==6||~options.weekends.indexOf(start.dateFormat( options.formatDate )) ) { + classes.push('xdsoft_weekend'); + } + + if(options.beforeShowDay && typeof options.beforeShowDay == 'function') { + classes.push(options.beforeShowDay(start)) + } + + table+=''; + + if( start.getDay()==options.dayOfWeekStartPrev ) { + table+=''; + } + + start.setDate(d+1); + } + table+='
'+options.i18n[options.lang].dayOfWeek[(j+options.dayOfWeekStart)>6?0:j+options.dayOfWeekStart]+'
'+ + '
'+d+'
'+ + '
'; + + calendar.html(table); + + mounth_picker.find('.xdsoft_label span').eq(0).text(options.i18n[options.lang].months[_xdsoft_datetime.currentTime.getMonth()]); + mounth_picker.find('.xdsoft_label span').eq(1).text(_xdsoft_datetime.currentTime.getFullYear()); + + // generate timebox + var time = '', + h = '', + m ='', + line_time = function line_time( h,m ) { + var now = _xdsoft_datetime.now(); + now.setHours(h); + h = parseInt(now.getHours()); + now.setMinutes(m); + m = parseInt(now.getMinutes()); + + classes = []; + if( (options.maxTime!==false&&_xdsoft_datetime.strtotime(options.maxTime).getTime()now.getTime())) + classes.push('xdsoft_disabled'); + if( (options.initTime||options.defaultSelect||datetimepicker.data('changed')) && parseInt(_xdsoft_datetime.currentTime.getHours())==parseInt(h)&&(options.step>59||Math[options.roundTime](_xdsoft_datetime.currentTime.getMinutes()/options.step)*options.step==parseInt(m))) { + if( options.defaultSelect||datetimepicker.data('changed')) { + classes.push('xdsoft_current'); + } else if( options.initTime ) { + classes.push('xdsoft_init_time'); + } + } + if( parseInt(today.getHours())==parseInt(h)&&parseInt(today.getMinutes())==parseInt(m)) + classes.push('xdsoft_today'); + time+= '
'+now.dateFormat(options.formatTime)+'
'; + }; + + if( !options.allowTimes || !$.isArray(options.allowTimes) || !options.allowTimes.length ) { + for( var i=0,j=0;i<(options.hours12?12:24);i++ ) { + for( j=0;j<60;j+=options.step ) { + h = (i<10?'0':'')+i; + m = (j<10?'0':'')+j; + line_time( h,m ); + } + } + }else{ + for( var i=0;i'+i+''; + } + yearselect.children().eq(0) + .html(opt); + + for( i = 0,opt = '';i<= 11;i++ ) { + opt+='
'+options.i18n[options.lang].months[i]+'
'; + } + monthselect.children().eq(0).html(opt); + $(datetimepicker) + .trigger('generate.xdsoft'); + },10); + event.stopPropagation(); + }) + .on('afterOpen.xdsoft',function() { + if( options.timepicker ) { + var classType; + if( timebox.find('.xdsoft_current').length ) { + classType = '.xdsoft_current'; + } else if( timebox.find('.xdsoft_init_time').length ) { + classType = '.xdsoft_init_time'; + } + + if( classType ) { + var pheight = timeboxparent[0].clientHeight, + height = timebox[0].offsetHeight, + top = timebox.find(classType).index()*options.timeHeightInTimePicker+1; + if( (height-pheight)1||(options.closeOnDateSelect===true||( options.closeOnDateSelect===0&&!options.timepicker )))&&!options.inline ) { + datetimepicker.trigger('close.xdsoft'); + } + + if( options.onSelectDate && options.onSelectDate.call ) { + options.onSelectDate.call(datetimepicker,_xdsoft_datetime.currentTime,datetimepicker.data('input')); + } + + datetimepicker.data('changed',true); + datetimepicker.trigger('xchange.xdsoft'); + datetimepicker.trigger('changedatetime.xdsoft'); + setTimeout(function(){ + timerclick = 0; + },200); + }); + + timebox + .on('click.xdsoft', 'div', function (xdevent) { + xdevent.stopPropagation(); // NAJ: Prevents closing of Pop-ups, Modals and Flyouts + var $this = $(this), + currentTime = _xdsoft_datetime.currentTime; + if( $this.hasClass('xdsoft_disabled') ) + return false; + currentTime.setHours($this.data('hour')); + currentTime.setMinutes($this.data('minute')); + datetimepicker.trigger('select.xdsoft',[currentTime]); + + datetimepicker.data('input').val( _xdsoft_datetime.str() ); + + !options.inline&&datetimepicker.trigger('close.xdsoft'); + + if( options.onSelectTime&&options.onSelectTime.call ) { + options.onSelectTime.call(datetimepicker,_xdsoft_datetime.currentTime,datetimepicker.data('input')); + } + datetimepicker.data('changed',true); + datetimepicker.trigger('xchange.xdsoft'); + datetimepicker.trigger('changedatetime.xdsoft'); + }); + + datetimepicker.mousewheel&&datepicker.mousewheel(function(event, delta, deltaX, deltaY) { + if( !options.scrollMonth ) + return true; + if( delta<0 ) + _xdsoft_datetime.nextMonth(); + else + _xdsoft_datetime.prevMonth(); + return false; + }); + + datetimepicker.mousewheel&&timeboxparent.unmousewheel().mousewheel(function(event, delta, deltaX, deltaY) { + if( !options.scrollTime ) + return true; + var pheight = timeboxparent[0].clientHeight, + height = timebox[0].offsetHeight, + top = Math.abs(parseInt(timebox.css('marginTop'))), + fl = true; + if( delta<0 && (height-pheight)-options.timeHeightInTimePicker>=top ) { + timebox.css('marginTop','-'+(top+options.timeHeightInTimePicker)+'px'); + fl = false; + }else if( delta>0&&top-options.timeHeightInTimePicker>=0 ) { + timebox.css('marginTop','-'+(top-options.timeHeightInTimePicker)+'px'); + fl = false; + } + timeboxparent.trigger('scroll_element.xdsoft_scroller',[Math.abs(parseInt(timebox.css('marginTop'))/(height-pheight))]); + event.stopPropagation(); + return fl; + }); + + var triggerAfterOpen = false; + datetimepicker + .on('changedatetime.xdsoft',function() { + if( options.onChangeDateTime&&options.onChangeDateTime.call ) { + var $input = datetimepicker.data('input'); + options.onChangeDateTime.call(datetimepicker, _xdsoft_datetime.currentTime, $input); + $input.trigger('change'); + } + }) + .on('generate.xdsoft',function() { + if( options.onGenerate&&options.onGenerate.call ) + options.onGenerate.call(datetimepicker,_xdsoft_datetime.currentTime,datetimepicker.data('input')); + if( triggerAfterOpen ){ + datetimepicker.trigger('afterOpen.xdsoft'); + triggerAfterOpen = false; + } + }) + .on( 'click.xdsoft', function( xdevent ) + { + xdevent.stopPropagation(); // Prevents closing of Pop-ups, Modals and Flyouts in Bootstrap + }); + + var current_time_index = 0; + input.mousewheel&&input.mousewheel(function( event, delta, deltaX, deltaY ) { + if( !options.scrollInput ) + return true; + if( !options.datepicker && options.timepicker ) { + current_time_index = timebox.find('.xdsoft_current').length?timebox.find('.xdsoft_current').eq(0).index():0; + if( current_time_index+delta>=0&¤t_time_index+delta$(window).height()+$(window).scrollTop() ) + top = offset.top-datetimepicker[0].offsetHeight+1; + if (top < 0) + top = 0; + if( left+datetimepicker[0].offsetWidth>$(window).width() ) + left = offset.left-datetimepicker[0].offsetWidth+datetimepicker.data('input')[0].offsetWidth; + } + datetimepicker.css({ + left:left, + top:top, + position: position + }); + }; + datetimepicker + .on('open.xdsoft', function() { + var onShow = true; + if( options.onShow&&options.onShow.call) { + onShow = options.onShow.call(datetimepicker,_xdsoft_datetime.currentTime,datetimepicker.data('input')); + } + if( onShow!==false ) { + datetimepicker.show(); + setPos(); + $(window) + .off('resize.xdsoft',setPos) + .on('resize.xdsoft',setPos); + + if( options.closeOnWithoutClick ) { + $([document.body,window]).on('mousedown.xdsoft',function arguments_callee6() { + datetimepicker.trigger('close.xdsoft'); + $([document.body,window]).off('mousedown.xdsoft',arguments_callee6); + }); + } + } + }) + .on('close.xdsoft', function( event ) { + var onClose = true; + if( options.onClose&&options.onClose.call ) { + onClose=options.onClose.call(datetimepicker,_xdsoft_datetime.currentTime,datetimepicker.data('input')); + } + if( onClose!==false&&!options.opened&&!options.inline ) { + datetimepicker.hide(); + } + event.stopPropagation(); + }) + .data('input',input); + + var timer = 0, + timer1 = 0; + + datetimepicker.data('xdsoft_datetime',_xdsoft_datetime); + datetimepicker.setOptions(options); + + function getCurrentValue(){ + + var ct = false; + + if (options.startDate instanceof Date && !isNaN(options.startDate.valueOf())) { + ct = options.startDate; + } else if (!ct && options.startDate!==false) { + ct = _xdsoft_datetime.strToDateTime(options.startDate); + } else if (!ct) { + ct = options.value?options.value:(input&&input.val&&input.val())?input.val():''; + ct = Date.parseDate(ct, options.format); + } + + if ( ct && _xdsoft_datetime.isValidDate(ct) ) { + datetimepicker.data('changed',true); + } else { + ct = ''; + } + + return ct?ct:0; + } + + _xdsoft_datetime.setCurrentTime( getCurrentValue() ); + + input + .data( 'xdsoft_datetimepicker',datetimepicker ) + .on('open.xdsoft focusin.xdsoft mousedown.xdsoft',function(event) { + if( input.is(':disabled')||input.is(':hidden')||!input.is(':visible')||(input.data('xdsoft_datetimepicker').is(':visible') && options.closeOnInputClick) ) + return; + clearTimeout(timer); + timer = setTimeout(function() { + if( input.is(':disabled')||input.is(':hidden')||!input.is(':visible') ) + return; + + triggerAfterOpen = true; + _xdsoft_datetime.setCurrentTime(getCurrentValue()); + + datetimepicker.trigger('open.xdsoft'); + },100); + }) + .on('keydown.xdsoft',function( event ) { + var val = this.value, + key = event.which; + switch(true) { + case !!~([ENTER].indexOf(key)): + var elementSelector = $("input:visible,textarea:visible"); + datetimepicker.trigger('close.xdsoft'); + elementSelector.eq(elementSelector.index(this) + 1).focus(); + return false; + case !!~[TAB].indexOf(key): + datetimepicker.trigger('close.xdsoft'); + return true; + } + }); + }, + destroyDateTimePicker = function( input ) { + var datetimepicker = input.data('xdsoft_datetimepicker'); + if( datetimepicker ) { + datetimepicker.data('xdsoft_datetime',null); + datetimepicker.remove(); + input + .data( 'xdsoft_datetimepicker',null ) + .off( 'open.xdsoft focusin.xdsoft focusout.xdsoft mousedown.xdsoft blur.xdsoft keydown.xdsoft' ); + $(window).off('resize.xdsoft'); + $([window,document.body]).off('mousedown.xdsoft'); + input.unmousewheel&&input.unmousewheel(); + } + }; + $(document) + .off('keydown.xdsoftctrl keyup.xdsoftctrl') + .on('keydown.xdsoftctrl',function(e) { + if ( e.keyCode == CTRLKEY ) + ctrlDown = true; + }) + .on('keyup.xdsoftctrl',function(e) { + if ( e.keyCode == CTRLKEY ) + ctrlDown = false; + }); + return this.each(function() { + var datetimepicker; + if( datetimepicker = $(this).data('xdsoft_datetimepicker') ) { + if( $.type(opt) === 'string' ) { + switch(opt) { + case 'show': + $(this).select().focus(); + datetimepicker.trigger( 'open.xdsoft' ); + break; + case 'hide': + datetimepicker.trigger('close.xdsoft'); + break; + case 'destroy': + destroyDateTimePicker($(this)); + break; + case 'reset': + this.value = this.defaultValue; + if(!this.value || !datetimepicker.data('xdsoft_datetime').isValidDate(Date.parseDate(this.value, options.format))) + datetimepicker.data('changed',false); + datetimepicker.data('xdsoft_datetime').setCurrentTime(this.value); + break; + } + }else{ + datetimepicker + .setOptions(opt); + } + return 0; + }else + if( ($.type(opt) !== 'string') ){ + if( !options.lazyInit||options.open||options.inline ){ + createDateTimePicker($(this)); + }else + lazyInit($(this)); + } + }); + }; + $.fn.datetimepicker.defaults = default_options; +})( jQuery ); + +/* + * Copyright (c) 2013 Brandon Aaron (http://brandonaaron.net) + * + * Licensed under the MIT License (LICENSE.txt). + * + * Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers. + * Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix. + * Thanks to: Seamus Leahy for adding deltaX and deltaY + * + * Version: 3.1.3 + * + * Requires: 1.2.2+ + */ +(function(factory) {if(typeof define==='function'&&define.amd) {define(['jquery'],factory)}else if(typeof exports==='object') {module.exports=factory}else{factory(jQuery)}}(function($) {var toFix=['wheel','mousewheel','DOMMouseScroll','MozMousePixelScroll'];var toBind='onwheel'in document||document.documentMode>=9?['wheel']:['mousewheel','DomMouseScroll','MozMousePixelScroll'];var lowestDelta,lowestDeltaXY;if($.event.fixHooks) {for(var i=toFix.length;i;) {$.event.fixHooks[toFix[--i]]=$.event.mouseHooks}}$.event.special.mousewheel={setup:function() {if(this.addEventListener) {for(var i=toBind.length;i;) {this.addEventListener(toBind[--i],handler,false)}}else{this.onmousewheel=handler}},teardown:function() {if(this.removeEventListener) {for(var i=toBind.length;i;) {this.removeEventListener(toBind[--i],handler,false)}}else{this.onmousewheel=null}}};$.fn.extend({mousewheel:function(fn) {return fn?this.bind("mousewheel",fn):this.trigger("mousewheel")},unmousewheel:function(fn) {return this.unbind("mousewheel",fn)}});function handler(event) {var orgEvent=event||window.event,args=[].slice.call(arguments,1),delta=0,deltaX=0,deltaY=0,absDelta=0,absDeltaXY=0,fn;event=$.event.fix(orgEvent);event.type="mousewheel";if(orgEvent.wheelDelta) {delta=orgEvent.wheelDelta}if(orgEvent.detail) {delta=orgEvent.detail*-1}if(orgEvent.deltaY) {deltaY=orgEvent.deltaY*-1;delta=deltaY}if(orgEvent.deltaX) {deltaX=orgEvent.deltaX;delta=deltaX*-1}if(orgEvent.wheelDeltaY!==undefined) {deltaY=orgEvent.wheelDeltaY}if(orgEvent.wheelDeltaX!==undefined) {deltaX=orgEvent.wheelDeltaX*-1}absDelta=Math.abs(delta);if(!lowestDelta||absDelta0?'floor':'ceil';delta=Math[fn](delta/lowestDelta);deltaX=Math[fn](deltaX/lowestDeltaXY);deltaY=Math[fn](deltaY/lowestDeltaXY);args.unshift(event,delta,deltaX,deltaY);return($.event.dispatch||$.event.handle).apply(this,args)}})); + + +// Parse and Format Library +//http://www.xaprb.com/blog/2005/12/12/javascript-closures-for-runtime-efficiency/ +/* + * Copyright (C) 2004 Baron Schwartz + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, version 2.1. + * + * This program 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 GNU Lesser General Public License for more + * details. + */ +Date.parseFunctions={count:0};Date.parseRegexes=[];Date.formatFunctions={count:0};Date.prototype.dateFormat=function(b){if(b=="unixtime"){return parseInt(this.getTime()/1000);}if(Date.formatFunctions[b]==null){Date.createNewFormat(b);}var a=Date.formatFunctions[b];return this[a]();};Date.createNewFormat=function(format){var funcName="format"+Date.formatFunctions.count++;Date.formatFunctions[format]=funcName;var code="Date.prototype."+funcName+" = function() {return ";var special=false;var ch="";for(var i=0;i 0) {";var regex="";var special=false;var ch="";for(var i=0;i 0 && z > 0){\nvar doyDate = new Date(y,0);\ndoyDate.setDate(z);\nm = doyDate.getMonth();\nd = doyDate.getDate();\n}";code+="if (y > 0 && m >= 0 && d > 0 && h >= 0 && i >= 0 && s >= 0)\n{return new Date(y, m, d, h, i, s);}\nelse if (y > 0 && m >= 0 && d > 0 && h >= 0 && i >= 0)\n{return new Date(y, m, d, h, i);}\nelse if (y > 0 && m >= 0 && d > 0 && h >= 0)\n{return new Date(y, m, d, h);}\nelse if (y > 0 && m >= 0 && d > 0)\n{return new Date(y, m, d);}\nelse if (y > 0 && m >= 0)\n{return new Date(y, m);}\nelse if (y > 0)\n{return new Date(y);}\n}return null;}";Date.parseRegexes[regexNum]=new RegExp("^"+regex+"$");eval(code);};Date.formatCodeToRegex=function(b,a){switch(b){case"D":return{g:0,c:null,s:"(?:Sun|Mon|Tue|Wed|Thu|Fri|Sat)"};case"j":case"d":return{g:1,c:"d = parseInt(results["+a+"], 10);\n",s:"(\\d{1,2})"};case"l":return{g:0,c:null,s:"(?:"+Date.dayNames.join("|")+")"};case"S":return{g:0,c:null,s:"(?:st|nd|rd|th)"};case"w":return{g:0,c:null,s:"\\d"};case"z":return{g:1,c:"z = parseInt(results["+a+"], 10);\n",s:"(\\d{1,3})"};case"W":return{g:0,c:null,s:"(?:\\d{2})"};case"F":return{g:1,c:"m = parseInt(Date.monthNumbers[results["+a+"].substring(0, 3)], 10);\n",s:"("+Date.monthNames.join("|")+")"};case"M":return{g:1,c:"m = parseInt(Date.monthNumbers[results["+a+"]], 10);\n",s:"(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)"};case"n":case"m":return{g:1,c:"m = parseInt(results["+a+"], 10) - 1;\n",s:"(\\d{1,2})"};case"t":return{g:0,c:null,s:"\\d{1,2}"};case"L":return{g:0,c:null,s:"(?:1|0)"};case"Y":return{g:1,c:"y = parseInt(results["+a+"], 10);\n",s:"(\\d{4})"};case"y":return{g:1,c:"var ty = parseInt(results["+a+"], 10);\ny = ty > Date.y2kYear ? 1900 + ty : 2000 + ty;\n",s:"(\\d{1,2})"};case"a":return{g:1,c:"if (results["+a+"] == 'am') {\nif (h == 12) { h = 0; }\n} else { if (h < 12) { h += 12; }}",s:"(am|pm)"};case"A":return{g:1,c:"if (results["+a+"] == 'AM') {\nif (h == 12) { h = 0; }\n} else { if (h < 12) { h += 12; }}",s:"(AM|PM)"};case"g":case"G":case"h":case"H":return{g:1,c:"h = parseInt(results["+a+"], 10);\n",s:"(\\d{1,2})"};case"i":return{g:1,c:"i = parseInt(results["+a+"], 10);\n",s:"(\\d{2})"};case"s":return{g:1,c:"s = parseInt(results["+a+"], 10);\n",s:"(\\d{2})"};case"O":return{g:0,c:null,s:"[+-]\\d{4}"};case"T":return{g:0,c:null,s:"[A-Z]{3}"};case"Z":return{g:0,c:null,s:"[+-]\\d{1,5}"};default:return{g:0,c:null,s:String.escape(b)};}};Date.prototype.getTimezone=function(){return this.toString().replace(/^.*? ([A-Z]{3}) [0-9]{4}.*$/,"$1").replace(/^.*?\(([A-Z])[a-z]+ ([A-Z])[a-z]+ ([A-Z])[a-z]+\)$/,"$1$2$3");};Date.prototype.getGMTOffset=function(){return(this.getTimezoneOffset()>0?"-":"+")+String.leftPad(Math.floor(Math.abs(this.getTimezoneOffset())/60),2,"0")+String.leftPad(Math.abs(this.getTimezoneOffset())%60,2,"0");};Date.prototype.getDayOfYear=function(){var a=0;Date.daysInMonth[1]=this.isLeapYear()?29:28;for(var b=0;bEvent edit - - {{ form(edit_form) }} - - +{% block css %} + {% stylesheets filter="compass" + "@CalciferBundle/Resources/assets/css/jquery.datetimepicker.scss" %} + + {% endstylesheets %} +{% endblock %} + +{% block javascripts %} + {% javascripts + "@CalciferBundle/Resources/assets/js/jquery.datetimepicker.js" + "@CalciferBundle/Resources/assets/js/events.js" %} + + {% endjavascripts %} +{% endblock %} + +{% block body -%} +
+
+

Termin bearbeiten

+
+
+ +
+
+ {{ include('CalciferBundle:Event:event_form.html.twig',{'entity':entity}) }} +
+
+ {% endblock %} diff --git a/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/event_box.html.twig b/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/event_box.html.twig new file mode 100755 index 0000000..1ce6bad --- /dev/null +++ b/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/event_box.html.twig @@ -0,0 +1,42 @@ +
+
+

{{ entity.summary }} +

+ +

+ Bearbeiten +

+ +

+ {{ entity.startdate.format('Y-m-d H:i') }} +

+ + {% if entity.location is not null %} +

+ {{ entity.location.name }} +

+ {% endif %} + {% if entity.tags|length > 0 %} + + {% endif %} + + {% if entity.url|length > 0 %} +

+ {{ entity.url }} +

+ {% endif %} + +
+ + {% if truncate_summary|default(false) %} +

{{ entity.description|truncate(255)|markdown }}

+ {% else %} +

{{ entity.description|markdown }}

+ {% endif %} + +
+
\ No newline at end of file diff --git a/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/event_form.html.twig b/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/event_form.html.twig new file mode 100755 index 0000000..9685306 --- /dev/null +++ b/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/event_form.html.twig @@ -0,0 +1,107 @@ +
+
+
+ + +
+ + + + +
+ +
+
+
+
+ + +
+ + + +
+
+
+ + +
+ + +
+ +
+
+
+ +
+ + +
+ +
+
+ +
+ + +
+ + +
+
+ +
+ + +
+ + + +
+
+ +
+ + +
+ + +
+
+ + +
+ +
\ No newline at end of file diff --git a/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/index.html.twig b/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/index.html.twig index 53e6bbf..3cd3bdf 100755 --- a/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/index.html.twig +++ b/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/index.html.twig @@ -1,49 +1,36 @@ {% extends 'CalciferBundle::layout.html.twig' %} +{% block css %} + {% stylesheets filter="compass" + "@CalciferBundle/Resources/assets/css/events.scss" + %} + + {% endstylesheets %} +{% endblock %} + +{% block javascripts %} + {% javascripts + "@CalciferBundle/Resources/assets/js/events.js" + %} + + {% endjavascripts %} +{% endblock %} + {% block body -%} -

Event list

+
+
+

+ Termine + {% if tag|default(false) %} für Tag „{{ tag.name }}“{% endif %} + {% if location|default(false) %} für Ort „{{ location.name }}{% endif %} +

+
+
- - - - - - - - - - - - - +
{% for entity in entities %} -
- - - - - - - - + {{ include('CalciferBundle:Event:event_box.html.twig',{'truncate_summary':true}) }} {% endfor %} - -
IdStartdateEnddateSummaryDescriptionUrlActions
{{ entity.id }}{{ entity.startdate }}{{ entity.enddate }}{{ entity.summary }}{{ entity.description }}{{ entity.url }} - -
+ - - {% endblock %} +{% endblock %} diff --git a/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/new.html.twig b/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/new.html.twig index fe82d01..b06123f 100755 --- a/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/new.html.twig +++ b/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/new.html.twig @@ -1,410 +1,31 @@ {% extends 'CalciferBundle::layout.html.twig' %} -{% form_theme form _self %} +{% block css %} + {% stylesheets filter="compass" + "@CalciferBundle/Resources/assets/css/jquery.datetimepicker.scss" %} + + {% endstylesheets %} +{% endblock %} + +{% block javascripts %} + {% javascripts + "@CalciferBundle/Resources/assets/js/jquery.datetimepicker.js" + "@CalciferBundle/Resources/assets/js/events.js" %} + + {% endjavascripts %} +{% endblock %} {% block body -%} -

Event creation

- -
-
-
- - -
-
- - - -
-
- - :
+
+
+

Termin bearbeiten

-
-
-
- - - -
-
- - : -
+
+
+ {{ include('CalciferBundle:Event:event_form.html.twig',{'entity':entity}) }}
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
- - -
- - - {% endblock %} diff --git a/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/show.html.twig b/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/show.html.twig index aefd191..b91fabd 100755 --- a/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/show.html.twig +++ b/src/Hackspace/Bundle/CalciferBundle/Resources/views/Event/show.html.twig @@ -1,52 +1,23 @@ {% extends 'CalciferBundle::layout.html.twig' %} -{% block body -%} -

Event

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Id{{ entity.id }}
Startdate{{ entity.startdate }}
Enddate{{ entity.enddate }}
Summary{{ entity.summary }}
Description{{ entity.description }}
Locations_id{{ entity.locationsid }}
Url{{ entity.url }}
- - +{% block css %} + {% stylesheets filter="compass" + "@CalciferBundle/Resources/assets/css/events.scss" + %} + + {% endstylesheets %} +{% endblock %} + +{% block javascripts %} + {% javascripts + "@CalciferBundle/Resources/assets/js/events.js" + %} + + {% endjavascripts %} +{% endblock %} + +{% block body -%} +
+ {{ include('CalciferBundle:Event:event_box.html.twig') }} +
{% endblock %} diff --git a/src/Hackspace/Bundle/CalciferBundle/Resources/views/Location/show.html.twig b/src/Hackspace/Bundle/CalciferBundle/Resources/views/Location/show.html.twig new file mode 100755 index 0000000..e69de29 diff --git a/src/Hackspace/Bundle/CalciferBundle/Resources/views/Tag/show.html.twig b/src/Hackspace/Bundle/CalciferBundle/Resources/views/Tag/show.html.twig new file mode 100755 index 0000000..e69de29 diff --git a/src/Hackspace/Bundle/CalciferBundle/Resources/views/layout.html.twig b/src/Hackspace/Bundle/CalciferBundle/Resources/views/layout.html.twig index 6e82825..2a10abd 100755 --- a/src/Hackspace/Bundle/CalciferBundle/Resources/views/layout.html.twig +++ b/src/Hackspace/Bundle/CalciferBundle/Resources/views/layout.html.twig @@ -5,23 +5,25 @@ {% block title %}Terminverwaltung Calcifer{% endblock %} - + + + + {% block css %} - - {% include 'BraincraftedBootstrapBundle::ie8-support.html.twig' %} + {% endblock %} {% include "CalciferBundle::navigation.html.twig" %} -
+
{% block body %}{% endblock %}
-{% block javascripts %}{% endblock %} - + +{% block javascripts %}{% endblock %} \ No newline at end of file diff --git a/src/Hackspace/Bundle/CalciferBundle/Resources/views/navigation.html.twig b/src/Hackspace/Bundle/CalciferBundle/Resources/views/navigation.html.twig index 79b3330..0ab4f6f 100755 --- a/src/Hackspace/Bundle/CalciferBundle/Resources/views/navigation.html.twig +++ b/src/Hackspace/Bundle/CalciferBundle/Resources/views/navigation.html.twig @@ -1,21 +1,7 @@ - -