Adding temporal work in resources.

app/bootstrap.php.cache

@@ -470,7 +470,16 @@ $this->format = null;
 }
 public static function createFromGlobals()
 {
-$request = self::createRequestFromFactory($_GET, $_POST, array(), $_COOKIE, $_FILES, $_SERVER);
+$server = $_SERVER;
+if ('cli-server'=== php_sapi_name()) {
+if (array_key_exists('HTTP_CONTENT_LENGTH', $_SERVER)) {
+$server['CONTENT_LENGTH'] = $_SERVER['HTTP_CONTENT_LENGTH'];
+}
+if (array_key_exists('HTTP_CONTENT_TYPE', $_SERVER)) {
+$server['CONTENT_TYPE'] = $_SERVER['HTTP_CONTENT_TYPE'];
+}
+}
+$request = self::createRequestFromFactory($_GET, $_POST, array(), $_COOKIE, $_FILES, $server);
 if (0 === strpos($request->headers->get('CONTENT_TYPE'),'application/x-www-form-urlencoded')
 && in_array(strtoupper($request->server->get('REQUEST_METHOD','GET')), array('PUT','DELETE','PATCH'))
 ) {
@@ -732,6 +741,9 @@ $clientIps = array_map('trim', explode(',', $this->headers->get(self::$trustedHe
 $clientIps[] = $ip;
 $ip = $clientIps[0];
 foreach ($clientIps as $key => $clientIp) {
+if (preg_match('{((?:\d+\.){3}\d+)\:\d+}', $clientIp, $match)) {
+$clientIps[$key] = $clientIp = $match[1];
+}
 if (IpUtils::checkIp($clientIp, self::$trustedProxies)) {
 unset($clientIps[$key]);
 }
@@ -2291,11 +2303,11 @@ protected $booted = false;
 protected $name;
 protected $startTime;
 protected $loadClassCache;
-const VERSION ='2.6.1';
-const VERSION_ID ='20601';
+const VERSION ='2.6.3';
+const VERSION_ID ='20603';
 const MAJOR_VERSION ='2';
 const MINOR_VERSION ='6';
-const RELEASE_VERSION ='1';
+const RELEASE_VERSION ='3';
 const EXTRA_VERSION ='';
 public function __construct($environment, $debug)
 {
@@ -2567,7 +2579,7 @@ foreach ($this->bundles as $name => $bundle) {
 $bundles[$name] = get_class($bundle);
 }
 return array_merge(
-array('kernel.root_dir'=> $this->rootDir,'kernel.environment'=> $this->environment,'kernel.debug'=> $this->debug,'kernel.name'=> $this->name,'kernel.cache_dir'=> $this->getCacheDir(),'kernel.logs_dir'=> $this->getLogDir(),'kernel.bundles'=> $bundles,'kernel.charset'=> $this->getCharset(),'kernel.container_class'=> $this->getContainerClass(),
+array('kernel.root_dir'=> realpath($this->rootDir) ?: $this->rootDir,'kernel.environment'=> $this->environment,'kernel.debug'=> $this->debug,'kernel.name'=> $this->name,'kernel.cache_dir'=> realpath($this->getCacheDir()) ?: $this->getCacheDir(),'kernel.logs_dir'=> realpath($this->getLogDir()) ?: $this->getLogDir(),'kernel.bundles'=> $bundles,'kernel.charset'=> $this->getCharset(),'kernel.container_class'=> $this->getContainerClass(),
 ),
 $this->getEnvParameters()
 );

app/config/mopa/mopa_bootstrap.yml

@@ -1,3 +1,5 @@
 mopa_bootstrap:
-    form: ~  # Adds twig form theme  support
+#    form:  # Adds twig form theme  support
+#        horizontal_label_class: 'aa'
+#        horizontal_input_wrapper_class: 'dd'
     menu: ~  # enables twig helpers for menu

app/config/sonata/sonata_page.yml

@@ -45,6 +45,7 @@ sonata_page:
         - sylius_flow_start
         - sylius_flow_display
         - sylius_flow_forward
+        - chamilo_core_user_user_mycourses
 
     cache_invalidation:
         service:  sonata.page.cache.invalidation.simple

src/Chamilo/CoreBundle/Entity/Block.php

@@ -52,7 +52,7 @@ class Block
     /**
      * @var boolean
      *
-     * @ORM\Column(name="active", type="boolean", precision=0, scale=0, nullable=false, unique=false)
+     * @ORM\Column(name="active", type="boolean", nullable=false, unique=false)
      */
     private $active;
 

src/Chamilo/CoreBundle/Entity/Repository/ResourceNodeRepository.php

@@ -0,0 +1,16 @@
+<?php
+/* For licensing terms, see /license.txt */
+
+namespace Chamilo\CoreBundle\Entity\Repository;
+
+use Doctrine\Common\Collections\Criteria;
+use Doctrine\ORM\EntityRepository;
+use Gedmo\Tree\Entity\Repository\NestedTreeRepository;
+
+/**
+ * Class ResourceNodeRepository
+ * @package Chamilo\CoreBundle\Entity\Repository
+ */
+class ResourceNodeRepository extends EntityRepository
+{
+}

src/Chamilo/CoreBundle/Entity/Resource/ResourceLink.php

@@ -59,6 +59,52 @@ class ResourceLink
      **/
     protected $rights;
 
+    /**
+     * @var boolean
+     *
+     * @ORM\Column(name="private", type="boolean", nullable=true, unique=false)
+     */
+    protected $private;
+
+    /**
+     * @var boolean
+     *
+     * @ORM\Column(name="public", type="boolean", nullable=true, unique=false)
+     */
+    protected $public;
+
+    /**
+     * @return boolean
+     */
+    public function isPrivate()
+    {
+        return $this->private;
+    }
+
+    /**
+     * @param boolean $private
+     */
+    public function setPrivate($private)
+    {
+        $this->private = $private;
+    }
+
+    /**
+     * @return boolean
+     */
+    public function isPublic()
+    {
+        return $this->public;
+    }
+
+    /**
+     * @param boolean $public
+     */
+    public function setPublic($public)
+    {
+        $this->public = $public;
+    }
+
     /**
      * @return ArrayCollection
      */
@@ -68,15 +114,18 @@ class ResourceLink
     }
 
     /**
-     * @param mixed $rights
+     * @param ArrayCollection $rights
+     * @return $this
      */
     public function setRights($rights)
     {
         $this->rights = $rights;
+
+        return $this;
     }
 
     /**
-     * @return mixed
+     * @return CGroupInfo
      */
     public function getGroup()
     {
@@ -93,42 +142,57 @@ class ResourceLink
 
     /**
      * @param int $id
+     * @return $this
      */
     public function setId($id)
     {
         $this->id = $id;
+
+        return $this;
     }
 
     /**
      * @param User $user
+     * @return $this
      */
     public function setUser(User $user)
     {
         $this->user = $user;
+
+        return $this;
     }
 
     /**
      * @param Course $course
+     * @return $this
      */
     public function setCourse(Course $course)
     {
         $this->course = $course;
+
+        return $this;
     }
 
     /**
      * @param Session $session
+     * @return $this
      */
     public function setSession(Session $session)
     {
         $this->session = $session;
+
+        return $this;
     }
 
     /**
      * @param CGroupInfo $group
+     * @return $this
      */
     public function setGroup(CGroupInfo $group)
     {
         $this->group = $group;
+
+        return $this;
     }
 
     /**
@@ -163,10 +227,13 @@ class ResourceLink
 
     /**
      * @param ResourceNode $resourceNode
+     * @return $this
      */
     public function setResourceNode(ResourceNode $resourceNode)
     {
         $this->resourceNode = $resourceNode;
+
+        return $this;
     }
 
     /**

src/Chamilo/CoreBundle/Entity/Resource/ResourceNode.php

@@ -12,7 +12,7 @@ use Gedmo\Mapping\Annotation as Gedmo;
 
 /**
  * Base entity for all resources.
- * @ORM\Entity(repositoryClass="Chamilo\CoreBundle\Repository\ResourceNodeRepository")
+ * @ORM\Entity(repositoryClass="Gedmo\Tree\Entity\Repository\MaterializedPathRepository")
  * @ORM\Table(name="resource_node")
  * @Gedmo\Tree(type="materializedPath")
  *
@@ -118,6 +118,14 @@ class ResourceNode
         $this->children = new ArrayCollection();
     }
 
+    /**
+     * @return string
+     */
+    public function __toString()
+    {
+        return (string) $this->getPath();
+    }
+
     /**
      * Returns the resource id.
      *

src/Chamilo/CoreBundle/Entity/Resource/ResourceRights.php

@@ -61,10 +61,13 @@ class ResourceRights
 
     /**
      * @param string $mask
+     * @return $this
      */
     public function setMask($mask)
     {
         $this->mask = $mask;
+
+        return $this;
     }
 
     /**
@@ -77,10 +80,13 @@ class ResourceRights
 
     /**
      * @param mixed $resourceLink
+     * @return $this
      */
     public function setResourceLink($resourceLink)
     {
         $this->resourceLink = $resourceLink;
+
+        return $this;
     }
 
     /**
@@ -93,10 +99,13 @@ class ResourceRights
 
     /**
      * @param string $role
+     * @return $this
      */
     public function setRole($role)
     {
         $this->role = $role;
+
+        return $this;
     }
 
     /**

src/Chamilo/CoreBundle/Security/Authorization/Voter/ResourceLinkVoter.php

@@ -6,6 +6,7 @@ namespace Chamilo\CoreBundle\Security\Authorization\Voter;
 use Chamilo\CoreBundle\Entity\Resource\ResourceLink;
 use Chamilo\CoreBundle\Entity\Resource\ResourceRights;
 use Chamilo\CoreBundle\Entity\ToolResourceRights;
+use Doctrine\Common\Collections\ArrayCollection;
 use Sonata\AdminBundle\Security\Acl\Permission\MaskBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Security\Core\Authorization\Voter\AbstractVoter;
@@ -93,7 +94,6 @@ class ResourceLinkVoter extends AbstractVoter
 
         if ($rightFromResourceLink->count()) {
             // Taken rights of the link
-            /** @var ResourceRights $right */
             $rights = $rightFromResourceLink;
         } else {
             // Taken the rights from the default tool

src/Chamilo/CourseBundle/Controller/ToolController.php

@@ -114,7 +114,8 @@ class ToolController extends ToolBaseCrudController
             $resourceNode = $this->getRepository()->addResourceToCourse(
                 $resource,
                 $this->getUser(),
-                $this->getCourse()
+                $this->getCourse(),
+                array()
             );
 
             $resource->setResourceNode($resourceNode);

src/Chamilo/CourseBundle/ToolChain.php

@@ -4,7 +4,11 @@
 namespace Chamilo\CourseBundle;
 
 use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Tool;
+use Chamilo\CoreBundle\Entity\ToolResourceRights;
 use Chamilo\CourseBundle\Entity\CTool;
+use Chamilo\CourseBundle\Tool\BaseTool;
+use Doctrine\Common\Persistence\ObjectManager;
 
 /**
  * Class ToolChain
@@ -38,6 +42,38 @@ class ToolChain
         return $this->tools;
     }
 
+    /**
+     * @param ObjectManager $manager
+     */
+    public function createTools(ObjectManager $manager)
+    {
+        $tools = $this->getTools();
+        $toolResourceRight = new ToolResourceRights();
+        $toolResourceRight
+            ->setRole('ROLE_TEACHER')
+            ->setMask(ToolResourceRights::getEditorMask())
+        ;
+
+        $toolResourceRightReader = new ToolResourceRights();
+        $toolResourceRightReader
+            ->setRole('ROLE_STUDENT')
+            ->setMask(ToolResourceRights::getReaderMask())
+        ;
+
+        /** @var BaseTool $tool */
+        foreach ($tools as $tool) {
+            $toolEntity = new Tool();
+            $toolEntity
+                ->setName($tool->getName())
+                ->setImage($tool->getImage())
+                ->setDescription($tool->getName().' - description')
+                ->addToolResourceRights($toolResourceRight)
+                ->addToolResourceRights($toolResourceRightReader)
+            ;
+            $manager->persist($toolEntity);
+        }
+    }
+
     /**
      * @param Course $course
      * @return Course
@@ -45,6 +81,7 @@ class ToolChain
     public function addToolsInCourse(Course $course)
     {
         $tools = $this->getTools();
+        /** @var BaseTool $tool */
         foreach ($tools as $tool) {
             $toolEntity = new CTool();
             $toolEntity

src/Chamilo/NotebookBundle/Controller/NotebookController.php

@@ -153,6 +153,7 @@ class NotebookController extends ToolBaseCrudController
         $resource = $this->findOr404($request);
         $resourceNode = $resource->getResourceNode();
         $link = $this->detectLink($resourceNode);
+
         if (false === $this->isGranted(ResourceLinkVoter::VIEW, $link)) {
             throw new AccessDeniedException('Unauthorised access!');
         }
@@ -231,11 +232,24 @@ class NotebookController extends ToolBaseCrudController
         $form = $this->getForm($resource);
 
         if ($form->handleRequest($request)->isValid()) {
+            $rights = $form->get('rights')->getData();
+
+            var_dump($rights);exit;
+
+            // Build links
+            switch ($rights['sharing']) {
+                case 'another_course':
+                    $idList = explode(',', $rights['search']);
+                    break;
+                case 'user':
+                    break;
+            }
 
             $resourceNode = $this->getRepository()->addResourceToCourse(
                 $resource,
                 $this->getUser(),
-                $this->getCourse()
+                $this->getCourse(),
+                $rights
             );
 
             $resource->setResourceNode($resourceNode);

src/Chamilo/NotebookBundle/Entity/CNotebook.php

@@ -20,12 +20,12 @@ class CNotebook extends AbstractResource
     /**
      * @var string
      *
-     * @ORM\Column(name="description", type="text", precision=0, scale=0, nullable=false, unique=false)
+     * @ORM\Column(name="description", type="text", nullable=false, unique=false)
      */
     protected $description;
 
     /**
-     *
+     * Constructor
      */
     public function __construct()
     {

src/Chamilo/NotebookBundle/Entity/NotebookRepository.php

@@ -5,12 +5,15 @@ namespace Chamilo\NotebookBundle\Entity;
 
 use Chamilo\CoreBundle\Entity\Course;
 use Chamilo\CoreBundle\Entity\Resource\ResourceLink;
+use Chamilo\CoreBundle\Entity\Resource\ResourceRights;
 use Chamilo\CoreBundle\Entity\Session;
 use Chamilo\CoreBundle\Entity\Tool;
+use Chamilo\CoreBundle\Entity\ToolResourceRights;
 use Chamilo\CourseBundle\Entity\CGroupInfo;
 use Chamilo\UserBundle\Entity\User;
 use Chamilo\CoreBundle\Entity\Resource\AbstractResource;
 use Chamilo\CoreBundle\Entity\Resource\ResourceNode;
+use Doctrine\Common\Collections\ArrayCollection;
 use Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository;
 
 /**
@@ -44,16 +47,45 @@ class NotebookRepository extends EntityRepository
      * @param Course $course
      * @return ResourceLink
      */
-    public function addResourceToCourse(AbstractResource $resource, User $user, Course $course)
-    {
+    public function addResourceToCourse(
+        AbstractResource $resource,
+        User $user,
+        Course $course,
+        $rights = array()
+    ) {
         $resourceNode = $this->addResource($resource, $user);
+        if ($resourceNode) {
 
             $resourceLink = new ResourceLink();
-        $resourceLink->setResourceNode($resourceNode);
-        $resourceLink->setCourse($course);
+            $resourceLink
+                ->setResourceNode($resourceNode)
+                ->setCourse($course);
+
+            if (!empty($rights)) {
+                /*$rights = $resourceLink->getResourceNode()->getTool()->getToolResourceRights();
+                 // @var ToolResourceRights $right
+                $newRights = new ArrayCollection();
+                foreach ($rights as $right) {
+                    $right->getRole()
+
+                    $newRights->add()
+                }*/
+
+                $rightsCollection = new ArrayCollection();
+                foreach ($rights as $right) {
+                    $resourceRight = new ResourceRights();
+                    $resourceRight
+                        ->setRole($right['role'])
+                        ->setMask($right['mask']);
+                    $rightsCollection->add($resourceRight);
+                }
+
+                $resourceLink->setRights($rightsCollection);
+            }
 
             $this->getEntityManager()->persist($resourceLink);
             $this->getEntityManager()->flush();
+        }
 
         return $resourceNode;
     }
@@ -125,9 +157,14 @@ class NotebookRepository extends EntityRepository
      * @param Course $course
      * @param Session $session
      */
-    public function addResourceToSession(AbstractResource $resource, User $user, Course $course, Session $session)
-    {
-        $resourceLink = $this->addResourceToCourse($resource, $user, $course);
+    public function addResourceToSession(
+        AbstractResource $resource,
+        User $user,
+        Course $course,
+        Session $session,
+        $rights
+    ) {
+        $resourceLink = $this->addResourceToCourse($resource, $user, $course, $rights);
         $resourceLink->setSession($session);
         $this->getEntityManager()->persist($resourceLink);
     }
@@ -138,9 +175,14 @@ class NotebookRepository extends EntityRepository
      * @param Course $course
      * @param CGroupInfo $group
      */
-    public function addResourceToGroup(AbstractResource $resource, User $user, Course $course, CGroupInfo $group)
-    {
-        $resourceLink = $this->addResourceToCourse($resource, $user, $course);
+    public function addResourceToGroup(
+        AbstractResource $resource,
+        User $user,
+        Course $course,
+        CGroupInfo $group,
+        $rights
+    ) {
+        $resourceLink = $this->addResourceToCourse($resource, $user, $course, $rights);
         $resourceLink->setGroup($group);
         $this->getEntityManager()->persist($resourceLink);
     }
@@ -155,7 +197,6 @@ class NotebookRepository extends EntityRepository
             ->findOneByName($this->getToolName());
     }
 
-
     /**
      * @return string
      */

src/Chamilo/NotebookBundle/Form/Type/NotebookType.php

@@ -21,6 +21,39 @@ class NotebookType extends AbstractType
         $builder
             ->add('name')
             ->add('description', 'ckeditor')
+            ->add(
+                'shared',
+                'choice',
+                array(
+                    'choices' => array(
+                        'only_me' => 'Only me',
+                        'shared' => 'Shared'
+                    ),
+                    'multiple' => false,
+                    'expanded' => true,
+                    'required' => true,
+                    'mapped' => false
+                )
+            )
+            ->add(
+                'rights',
+                'collection',
+                array(
+                    'type' => new ResourceLinkType(),
+                    'mapped' => false,
+                    'allow_add' => true,
+                )
+            )
+            /*->add(
+                'rights',
+                'collection',
+                array(
+                    'type' => new ResourceRightsType(),
+                    'mapped' => false,
+                    'allow_add' => true,
+                )
+            )*/
+            //->add('resourceNode', new ResourceNodeType())
             ->add('save', 'submit');
     }
 

src/Chamilo/NotebookBundle/Form/Type/ResourceLinkType.php

@@ -0,0 +1,71 @@
+<?php
+/* For licensing terms, see /license.txt */
+
+namespace Chamilo\NotebookBundle\Form\Type;
+
+use Chamilo\CoreBundle\Entity\ToolResourceRights;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+/**
+ * Class ResourceLinkType
+ * @package Chamilo\NotebookBundle\Form\Type
+ */
+class ResourceLinkType extends AbstractType
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add(
+                'sharing',
+                'choice',
+                array(
+                    'choices' => array(
+                        'public' => 'Public',
+                        //'private' => 'Only me',
+                        'this_course' => 'This course',
+                        'another_course' => 'Another course',
+                        'user'=> 'User'
+                    ),
+                    'attr' => array('class' => 'sharing_options')
+                )
+            )
+            ->add('search', 'hidden', array('attr' => array('class' => 'extra_hidden')))
+            ->add(
+                'mask',
+                'choice',
+                array('choices' => ToolResourceRights::getMaskList())
+            )
+            /*->add(
+                'rights',
+                'collection',
+                array(
+                    'type' => new ResourceRightsType(),
+                    'allow_add'    => true,
+                )
+            )*/
+        ;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults(array(
+            'data_class' => 'Chamilo\CoreBundle\Entity\Resource\ResourceLink'
+        ));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return 'chamilo_resource_link_type';
+    }
+}

src/Chamilo/NotebookBundle/Form/Type/ResourceNodeType.php

@@ -0,0 +1,46 @@
+<?php
+/* For licensing terms, see /license.txt */
+
+namespace Chamilo\NotebookBundle\Form\Type;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+/**
+ * Class ResourceNodeType
+ * @package Chamilo\NotebookBundle\Form\Type
+ */
+class ResourceNodeType extends AbstractType
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('tool')
+            ->add('links',  'collection', array(
+                'type' =>new ResourceLinkType())
+            )
+        ;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults(array(
+            'data_class' => 'Chamilo\CoreBundle\Entity\Resource\ResourceNode'
+        ));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return 'chamilo_resource_node_type';
+    }
+}

src/Chamilo/NotebookBundle/Form/Type/ResourceRightsType.php

@@ -0,0 +1,53 @@
+<?php
+/* For licensing terms, see /license.txt */
+
+namespace Chamilo\NotebookBundle\Form\Type;
+
+use Chamilo\CoreBundle\Entity\ToolResourceRights;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+/**
+ * Class ResourceRightsType
+ * @package Chamilo\NotebookBundle\Form\Type
+ */
+class ResourceRightsType extends AbstractType
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add(
+                'role',
+                'choice',
+                array('choices' => ToolResourceRights::getDefaultRoles())
+            )
+            ->add(
+                'mask',
+                'choice',
+                array('choices' => ToolResourceRights::getMaskList())
+            )
+        ;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults(array(
+            'data_class' => 'Chamilo\CoreBundle\Entity\Resource\ResourceRights'
+        ));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return 'chamilo_resource_rights_type';
+    }
+}

src/Chamilo/NotebookBundle/Resources/views/Notebook/create.html.twig

@@ -1,11 +1,141 @@
+<script>
+    var $collectionHolder;
+
+    // setup an "add a tag" link
+    var $addTagLink = $('<a href="#" class="btn add_tag_link">Add option</a>');
+    var $newLinkLi = $('<li></li>').append($addTagLink);
+
+    jQuery(document).ready(function() {
+        // Get the ul that holds the collection of tags
+        $collectionHolder = $('ul.tags');
+
+        // add the "add a tag" anchor and li to the tags ul
+        $collectionHolder.append($newLinkLi);
+
+        // count the current form inputs we have (e.g. 2), use that as the new
+        // index when inserting a new item (e.g. 2)
+        $collectionHolder.data('index', $collectionHolder.find(':input').length);
+
+        $addTagLink.on('click', function(e) {
+            // prevent the link from creating a "#" on the URL
+            e.preventDefault();
+
+            // add a new tag form (see next code block)
+            addTagForm($collectionHolder, $newLinkLi);
+        });
+    });
+
+    function repoFormatResult(repo) {
+        console.log(repo);
+        var markup = '<div class="row-fluid">' +
+                '<div class="span2"><img src="' + repo.owner.avatar_url + '" /></div>' +
+                '<div class="span10">' +
+                '<div class="row-fluid">' +
+                '<div class="span6">' + repo.full_name + '</div>' +
+                '<div class="span3"><i class="fa fa-code-fork"></i> ' + repo.forks_count + '</div>' +
+                '<div class="span3"><i class="fa fa-star"></i> ' + repo.stargazers_count + '</div>' +
+                '</div>';
+
+        if (repo.description) {
+            markup += '<div>' + repo.description + '</div>';
+        }
+
+        markup += '</div></div>';
+
+        return markup;
+    }
+
+    function addTagForm($collectionHolder, $newLinkLi) {
+        // Get the data-prototype explained earlier
+        var prototype = $collectionHolder.data('prototype');
+
+        // get the new index
+        var index = $collectionHolder.data('index');
+
+        // Replace '__name__' in the prototype's HTML to
+        // instead be a number based on how many items we have
+        var newForm = prototype.replace(/__name__/g, index);
+
+        // increase the index with one for the next item
+        $collectionHolder.data('index', index + 1);
+
+        // Display the form in the page in an li, before the "Add a tag" link li
+        var $newFormLi = $('<li></li>').append(newForm);
+        $newLinkLi.before($newFormLi);
+
+        $('.sharing_options').on('change', function() {
+
+            var inputId = this.id;
+            var hiddenInput = inputId.replace("sharing", "search");
+            var field = $('#' + hiddenInput);
+            var select2 = $('#s2id_' + hiddenInput);
+
+            var url = '';
+            switch (this.value) {
+                case 'another_course':
+                    field.show();
+                    select2.show();
+                    url = Routing.generate('chamilo_core_user_user_mycourses');
+                    break;
+                case 'user':
+                    field.show();
+                    select2.show();
+                    url = Routing.generate('chamilo_core_user_user_mycourses');
+                    break;
+                default:
+                    field.hide();
+                    select2.hide();
+                    break;
+            }
+
+            if (url != '') {
+                field.select2({
+                    tags: true,
+                    tokenSeparators: [',', ' '],
+                    ajax: {
+                        url: url,
+                        dataType: 'json',
+                        type: "GET",
+                        delay: 250,
+                        data: function (params) {
+                            return {
+                                q: params.term, // search term
+                                page: params.page
+                            };
+                        },
+                        results: function (data, page) {
+                            data = data.items;
+                            return {
+                                results: $.map(data, function (item) {
+                                    return {
+                                        text: item.title,
+                                        slug: item.title,
+                                        id: item.id
+                                    }
+                                })
+                            };
+                        }
+                    }
+                });
+            }
+        });
+    }
+</script>
+
 <div class="box box-primary">
     <div class="box-header">
         <h3 class="box-title">Create</h3>
     </div>
     <form method="post" action="{{ path('chamilo_notebook_new', {'course': course }) }}">
         <div class="box-body">
-        {{ form_widget(form) }}
+            {{ form_start(form) }}
+
+            {{ form_row(form.name) }}
+            {{ form_row(form.description) }}
+
+            <ul class="tags" data-prototype="{{ form_widget(form.rights.vars.prototype)|e }}">
+            </ul>
+            {{ form_end(form) }}
         </div>
     </form>
 </div>
-</div>