Permalink
Browse files

added "Star" functionality

  • Loading branch information...
inmarelibero committed Nov 19, 2012
1 parent a83d221 commit 26b6fb3a89e0e7662aa94bf6e7ebf0139974e0e9
Showing with 919 additions and 48 deletions.
  1. +3 −0 app/AppKernel.php
  2. +3 −0 app/config/assetic.yml
  3. +1 −0 app/config/config.yml
  4. +2 −1 composer.json
  5. +141 −40 composer.lock
  6. +65 −0 src/Bricks/SiteBundle/Controller/BrickController.php
  7. +45 −0 src/Bricks/SiteBundle/Entity/Brick.php
  8. +212 −1 src/Bricks/SiteBundle/Entity/BrickLogEntry.php
  9. +162 −0 src/Bricks/SiteBundle/Entity/UserStarsBrick.php
  10. +15 −0 src/Bricks/SiteBundle/Entity/UserStarsBrickRepository.php
  11. +61 −0 src/Bricks/SiteBundle/Resources/js/Brick/toggleUserStarsBrick.js
  12. +19 −0 src/Bricks/SiteBundle/Resources/less/controller-brick.less
  13. +2 −0 src/Bricks/SiteBundle/Resources/translations/messages.en.yml
  14. +2 −0 src/Bricks/SiteBundle/Resources/translations/messages.es.yml
  15. +2 −0 src/Bricks/SiteBundle/Resources/translations/messages.it.yml
  16. +4 −1 src/Bricks/SiteBundle/Resources/views/Brick/show.html.twig
  17. +6 −0 src/Bricks/SiteBundle/Resources/views/Default/index.html.twig
  18. +35 −0 src/Bricks/SiteBundle/Resources/views/macros/macrosBrick.html.twig
  19. +19 −0 src/Bricks/UserBundle/Controller/BrickController.php
  20. +75 −0 src/Bricks/UserBundle/Entity/User.php
  21. +2 −1 src/Bricks/UserBundle/Resources/translations/UserBundle.en.yml
  22. +2 −1 src/Bricks/UserBundle/Resources/translations/UserBundle.es.yml
  23. +2 −1 src/Bricks/UserBundle/Resources/translations/UserBundle.it.yml
  24. +32 −0 src/Bricks/UserBundle/Resources/views/Brick/starred.html.twig
  25. +7 −2 src/Bricks/UserBundle/Resources/views/layout.html.twig
View
@@ -28,6 +28,9 @@ public function registerBundles()
// KnpMarkdownBundle
new Knp\Bundle\MarkdownBundle\KnpMarkdownBundle(),
+
+ // FOSJsRoutingBundle
+ new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
// Bricks bundles
new Bricks\SiteBundle\BricksSiteBundle(),
View
@@ -33,6 +33,9 @@ assetic:
- %kernel.root_dir%/../web/assets/bootstrap/js/bootstrap-tab.js
- %kernel.root_dir%/../web/assets/bootstrap/js/bootstrap-alert.js
- %kernel.root_dir%/../web/assets/bootstrap/js/bootstrap-modal.js
+ - bundles/fosjsrouting/js/router.js
+ - %kernel.root_dir%/../web/js/fos_js_routes.js
+ - @BricksSiteBundle/Resources/js/*.js
- @BricksSiteBundle/Resources/js/*/*.js
filters:
- cssrewrite
View
@@ -87,3 +87,4 @@ stof_doctrine_extensions:
timestampable: true
sluggable: true
loggable: true
+
View
@@ -22,7 +22,8 @@
"friendsofsymfony/user-bundle": "*",
"leafo/lessphp": "dev-master",
"stof/doctrine-extensions-bundle": "dev-master",
- "knplabs/knp-markdown-bundle": "1.2.*@dev"
+ "knplabs/knp-markdown-bundle": "1.2.*@dev",
+ "friendsofsymfony/jsrouting-bundle": "*"
},
"scripts": {
"post-install-cmd": [
Oops, something went wrong.

0 comments on commit 26b6fb3

Please sign in to comment.