commit 96e0d7b8210148d5f3714cc1962169f475d6b0c8
parent 7eb99b031ecd2129fa072c64da44fc81da0cee89
Author: Felicitus <felicitus@felicitus.org>
Date: Sun, 15 Mar 2015 15:17:08 +0100
Added FontAwesome and set it as default glylph set
Diffstat:
3 files changed, 105 insertions(+), 55 deletions(-)
diff --git a/composer.json b/composer.json
@@ -41,7 +41,8 @@
"friendsofsymfony/rest-bundle": "1.5.0",
"jms/serializer-bundle": "0.13.0",
"cbsi/doctrine2-nestedset": "dev-master",
- "zendmaniacs/extjs5": "dev-master"
+ "zendmaniacs/extjs5": "dev-master",
+ "fortawesome/font-awesome": "4.1.0"
},
"autoload": {
"psr-0": { "": "src/",
diff --git a/composer.lock b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "3864152761705eb89257f9257c60f505",
+ "hash": "51531e7d2e001a0f394195667f791526",
"packages": [
{
"name": "cbsi/doctrine2-nestedset",
@@ -58,16 +58,16 @@
},
{
"name": "composer/installers",
- "version": "v1.0.20",
+ "version": "v1.0.21",
"source": {
"type": "git",
"url": "https://github.com/composer/installers.git",
- "reference": "1bff8aa77a18f3616f468ed8000cf86a5725bac3"
+ "reference": "d64e23fce42a4063d63262b19b8e7c0f3b5e4c45"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/installers/zipball/1bff8aa77a18f3616f468ed8000cf86a5725bac3",
- "reference": "1bff8aa77a18f3616f468ed8000cf86a5725bac3",
+ "url": "https://api.github.com/repos/composer/installers/zipball/d64e23fce42a4063d63262b19b8e7c0f3b5e4c45",
+ "reference": "d64e23fce42a4063d63262b19b8e7c0f3b5e4c45",
"shasum": ""
},
"replace": {
@@ -113,6 +113,7 @@
"Thelia",
"WolfCMS",
"agl",
+ "aimeos",
"annotatecms",
"bitrix",
"cakephp",
@@ -148,7 +149,7 @@
"zend",
"zikula"
],
- "time": "2015-01-11 03:51:11"
+ "time": "2015-02-18 17:17:01"
},
{
"name": "doctrine/annotations",
@@ -507,16 +508,16 @@
},
{
"name": "doctrine/doctrine-bundle",
- "version": "v1.3.0",
+ "version": "v1.4.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/DoctrineBundle.git",
- "reference": "3beb3a780485ab01f86941f4892cd23ef8c39c6b"
+ "reference": "1986ff3a945b584c6505d07eae92d77e41131078"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/3beb3a780485ab01f86941f4892cd23ef8c39c6b",
- "reference": "3beb3a780485ab01f86941f4892cd23ef8c39c6b",
+ "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/1986ff3a945b584c6505d07eae92d77e41131078",
+ "reference": "1986ff3a945b584c6505d07eae92d77e41131078",
"shasum": ""
},
"require": {
@@ -525,17 +526,15 @@
"jdorn/sql-formatter": "~1.1",
"php": ">=5.3.2",
"symfony/doctrine-bridge": "~2.2",
- "symfony/framework-bundle": "~2.2"
+ "symfony/framework-bundle": "~2.3"
},
"require-dev": {
"doctrine/orm": "~2.3",
- "phpunit/php-code-coverage": "~1.2",
- "phpunit/phpunit": "~3.7",
- "phpunit/phpunit-mock-objects": "~1.2",
+ "phpunit/phpunit": "~4",
"satooshi/php-coveralls": "~0.6.1",
"symfony/validator": "~2.2",
"symfony/yaml": "~2.2",
- "twig/twig": "~1"
+ "twig/twig": "~1.10"
},
"suggest": {
"doctrine/orm": "The Doctrine ORM integration is optional in the bundle.",
@@ -544,7 +543,7 @@
"type": "symfony-bundle",
"extra": {
"branch-alias": {
- "dev-master": "1.3.x-dev"
+ "dev-master": "1.4.x-dev"
}
},
"autoload": {
@@ -582,7 +581,7 @@
"orm",
"persistence"
],
- "time": "2014-11-28 08:32:03"
+ "time": "2015-02-28 11:04:45"
},
{
"name": "doctrine/doctrine-cache-bundle",
@@ -863,6 +862,54 @@
"time": "2014-12-16 13:45:01"
},
{
+ "name": "fortawesome/font-awesome",
+ "version": "4.1.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/FortAwesome/Font-Awesome.git",
+ "reference": "2649d91d18629bab071449b3bc4cb02761037a57"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/FortAwesome/Font-Awesome/zipball/2649d91d18629bab071449b3bc4cb02761037a57",
+ "reference": "2649d91d18629bab071449b3bc4cb02761037a57",
+ "shasum": ""
+ },
+ "require-dev": {
+ "jekyll": "1.0.2",
+ "lessc": "1.4.2"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.0.x-dev"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "OFL-1.1",
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Dave Gandy",
+ "email": "dave@fontawesome.io",
+ "homepage": "http://twitter.com/davegandy",
+ "role": "Developer"
+ }
+ ],
+ "description": "The iconic font and CSS framework",
+ "homepage": "http://fontawesome.io/",
+ "keywords": [
+ "FontAwesome",
+ "awesome",
+ "bootstrap",
+ "font",
+ "icon"
+ ],
+ "time": "2014-05-14 20:37:30"
+ },
+ {
"name": "friendsofsymfony/rest-bundle",
"version": "1.5.0",
"target-dir": "FOS/RestBundle",
@@ -1345,16 +1392,16 @@
},
{
"name": "michelf/php-markdown",
- "version": "1.4.1",
+ "version": "1.5.0",
"source": {
"type": "git",
"url": "https://github.com/michelf/php-markdown.git",
- "reference": "de9a19c7bf352d41cc99ed86c3c0ef17e87394b6"
+ "reference": "e1aabe18173231ebcefc90e615565742fc1c7fd9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/michelf/php-markdown/zipball/de9a19c7bf352d41cc99ed86c3c0ef17e87394b6",
- "reference": "de9a19c7bf352d41cc99ed86c3c0ef17e87394b6",
+ "url": "https://api.github.com/repos/michelf/php-markdown/zipball/e1aabe18173231ebcefc90e615565742fc1c7fd9",
+ "reference": "e1aabe18173231ebcefc90e615565742fc1c7fd9",
"shasum": ""
},
"require": {
@@ -1377,35 +1424,35 @@
],
"authors": [
{
+ "name": "John Gruber",
+ "homepage": "http://daringfireball.net/"
+ },
+ {
"name": "Michel Fortin",
"email": "michel.fortin@michelf.ca",
- "homepage": "http://michelf.ca/",
+ "homepage": "https://michelf.ca/",
"role": "Developer"
- },
- {
- "name": "John Gruber",
- "homepage": "http://daringfireball.net/"
}
],
"description": "PHP Markdown",
- "homepage": "http://michelf.ca/projects/php-markdown/",
+ "homepage": "https://michelf.ca/projects/php-markdown/",
"keywords": [
"markdown"
],
- "time": "2014-05-05 02:43:50"
+ "time": "2015-03-01 12:03:08"
},
{
"name": "monolog/monolog",
- "version": "1.12.0",
+ "version": "1.13.1",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
- "reference": "1fbe8c2641f2b163addf49cc5e18f144bec6b19f"
+ "reference": "c31a2c4e8db5da8b46c74cf275d7f109c0f249ac"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1fbe8c2641f2b163addf49cc5e18f144bec6b19f",
- "reference": "1fbe8c2641f2b163addf49cc5e18f144bec6b19f",
+ "url": "https://api.github.com/repos/Seldaek/monolog/zipball/c31a2c4e8db5da8b46c74cf275d7f109c0f249ac",
+ "reference": "c31a2c4e8db5da8b46c74cf275d7f109c0f249ac",
"shasum": ""
},
"require": {
@@ -1422,6 +1469,7 @@
"phpunit/phpunit": "~4.0",
"raven/raven": "~0.5",
"ruflin/elastica": "0.90.*",
+ "swiftmailer/swiftmailer": "~5.3",
"videlalvaro/php-amqplib": "~2.4"
},
"suggest": {
@@ -1438,7 +1486,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.12.x-dev"
+ "dev-master": "1.13.x-dev"
}
},
"autoload": {
@@ -1464,7 +1512,7 @@
"logging",
"psr-3"
],
- "time": "2014-12-29 21:29:35"
+ "time": "2015-03-09 09:58:04"
},
{
"name": "nelmio/api-doc-bundle",
@@ -1680,17 +1728,17 @@
},
{
"name": "sensio/distribution-bundle",
- "version": "v2.3.9",
+ "version": "v2.3.11",
"target-dir": "Sensio/Bundle/DistributionBundle",
"source": {
"type": "git",
"url": "https://github.com/sensiolabs/SensioDistributionBundle.git",
- "reference": "ac4893621b30faf8f970758afea7640122767817"
+ "reference": "374bbea795fa69a85b1623048798a89aebffe62b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/ac4893621b30faf8f970758afea7640122767817",
- "reference": "ac4893621b30faf8f970758afea7640122767817",
+ "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/374bbea795fa69a85b1623048798a89aebffe62b",
+ "reference": "374bbea795fa69a85b1623048798a89aebffe62b",
"shasum": ""
},
"require": {
@@ -1722,7 +1770,7 @@
"configuration",
"distribution"
],
- "time": "2015-02-01 05:39:51"
+ "time": "2015-02-27 12:58:18"
},
{
"name": "sensio/framework-extra-bundle",
@@ -1775,17 +1823,17 @@
},
{
"name": "sensio/generator-bundle",
- "version": "v2.5.1",
+ "version": "v2.5.2",
"target-dir": "Sensio/Bundle/GeneratorBundle",
"source": {
"type": "git",
"url": "https://github.com/sensiolabs/SensioGeneratorBundle.git",
- "reference": "9e23fc3de265ae013690d84aab98e7a84f46edcd"
+ "reference": "4b09746520a826a7bf34a466ba31c7d8740fef7e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/9e23fc3de265ae013690d84aab98e7a84f46edcd",
- "reference": "9e23fc3de265ae013690d84aab98e7a84f46edcd",
+ "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/4b09746520a826a7bf34a466ba31c7d8740fef7e",
+ "reference": "4b09746520a826a7bf34a466ba31c7d8740fef7e",
"shasum": ""
},
"require": {
@@ -1819,20 +1867,20 @@
}
],
"description": "This bundle generates code for you",
- "time": "2015-01-13 07:33:46"
+ "time": "2015-02-11 07:21:23"
},
{
"name": "swiftmailer/swiftmailer",
- "version": "v5.3.1",
+ "version": "v5.4.0",
"source": {
"type": "git",
"url": "https://github.com/swiftmailer/swiftmailer.git",
- "reference": "c5f963e7f9d6f6438fda4f22d5cc2db296ec621a"
+ "reference": "31454f258f10329ae7c48763eb898a75c39e0a9f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/c5f963e7f9d6f6438fda4f22d5cc2db296ec621a",
- "reference": "c5f963e7f9d6f6438fda4f22d5cc2db296ec621a",
+ "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/31454f258f10329ae7c48763eb898a75c39e0a9f",
+ "reference": "31454f258f10329ae7c48763eb898a75c39e0a9f",
"shasum": ""
},
"require": {
@@ -1844,7 +1892,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "5.3-dev"
+ "dev-master": "5.4-dev"
}
},
"autoload": {
@@ -1871,7 +1919,7 @@
"mail",
"mailer"
],
- "time": "2014-12-05 14:17:14"
+ "time": "2015-03-14 06:06:39"
},
{
"name": "symfony/assetic-bundle",
@@ -2374,12 +2422,12 @@
"source": {
"type": "git",
"url": "https://github.com/zendmaniacs/extjs5.git",
- "reference": "6adaee3015360d0bdb9bf8dfcb685905651da576"
+ "reference": "77a9e5002be20038337a4c621c512f09bf064bd6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendmaniacs/extjs5/zipball/6adaee3015360d0bdb9bf8dfcb685905651da576",
- "reference": "6adaee3015360d0bdb9bf8dfcb685905651da576",
+ "url": "https://api.github.com/repos/zendmaniacs/extjs5/zipball/77a9e5002be20038337a4c621c512f09bf064bd6",
+ "reference": "77a9e5002be20038337a4c621c512f09bf064bd6",
"shasum": ""
},
"require": {
@@ -2395,7 +2443,7 @@
"extjs5",
"zendmaniacs"
],
- "time": "2015-02-04 11:26:50"
+ "time": "2015-02-09 15:57:01"
}
],
"packages-dev": [],
diff --git a/src/PartKeepr/FrontendBundle/Resources/public/js/PartKeepr.js b/src/PartKeepr/FrontendBundle/Resources/public/js/PartKeepr.js
@@ -5,6 +5,7 @@ PartKeepr.application = null;
Ext.application({
name: 'PartKeepr',
launch: function() {
+ Ext.setGlyphFontFamily('FontAwesome');
Ext.get("loading").hide();
Ext.setLocale('en_US');
