BUG: fixed bug #200 Was a javascript error

Also fixed edit/create form
Added some html5 elements

Author: Charles Ma

core/controllers/FolderController.php

@@ -55,8 +55,8 @@ function editAction()
       {
       $name = $this->_getParam('name');
 
-      // Check ifa folder with the same name already exists for the same parent
-      if($this->Folder->getFolderExists($name, $folder->getParent()))
+      // Check if folder with the same name already exists for the same parent
+      if($folder->getName() != $name && $this->Folder->getFolderExists($name, $folder->getParent()))
         {
         throw new Zend_Exception('This name is already used');
         }
@@ -239,6 +239,9 @@ public function createfolderAction()
     $folder_id = $this->_getParam('folderId');
     $folder = $this->Folder->load($folder_id);
     $header = "";
+    $form = $this->Form->Folder->createEditForm();
+    $formArray = $this->getFormAsArray($form);    
+    $this->view->form = $formArray;
     if(!isset($folder_id))
       {
       throw new Zend_Exception("Please set the folderId.");
@@ -265,6 +268,12 @@ public function createfolderAction()
           }
         else
           {
+          // Check if folder with the same name already exists for the same parent
+          if($this->Folder->getFolderExists($name, $folder))
+            {
+            echo JsonComponent::encode(array(false, $this->t('This name is already used')));
+            return;
+            }
           $new_folder = $this->Folder->createFolder($name, '', $folder);
           $policyGroup = $folder->getFolderpolicygroup();
           $policyUser = $folder->getFolderpolicyuser();

core/controllers/forms/FolderForm.php

@@ -22,11 +22,14 @@ public function createEditForm()
           ->setMethod('post');
 
     $name = new Zend_Form_Element_Text('name');
-    $name ->setRequired(true)
+    $name ->setAttribs(array('placeholder' => $this->t('Name of the folder'), 'autofocus' => 'autofocus', 'required' => 'required'))
+          ->setRequired(true)
           ->addValidator('NotEmpty', true);
 
     $description = new Zend_Form_Element_Textarea('description');
+    $description ->setAttribs(array('placeholder' => $this->t('Optional')));
     $teaser = new Zend_Form_Element_Text('teaser');
+    $teaser ->setAttribs(array('placeholder' => $this->t('Optional')));
     $teaser->setAttrib('MAXLENGTH', '250');
     $submit = new  Zend_Form_Element_Submit('submit');
     $submit ->setLabel($this->t("Save"));

core/public/css/folder/folder.createfolder.css

@@ -0,0 +1,5 @@
+form#editFolderForm input[type="text"], form#editFolderForm  input[type="password"] ,form#editFolderForm textarea
+{
+  width: 350px!important;
+}
+

core/public/js/common/common.browser.js

@@ -110,15 +110,15 @@
                 if(jsonResponse[0])
                   {
                     createNotive(jsonResponse[1],1500);
+                    node.remove();
+                    $( "div.MainDialog" ).dialog('close');
                     node.each(function(){
                       var children = childrenOf($(this));
-                      if(children!=undefined)
+                      if(children != undefined)
                         {
                         children.remove();
                         }
-                    });
-                    node.remove();
-                    $( "div.MainDialog" ).dialog('close');
+                    });                    
                   }
                 else
                   {

core/translation/fr-main.csv

@@ -251,4 +251,8 @@ Add in group;Ajouter au groupe
 Set as moderator;Promouvoir en tant que mod�rateur
 Remove from community;Retirer de la communaut�
 Remove from group;Retirer du groupe
-Add Metadata;Ajouter M�tadonn�e
+Add Metadata;Ajouter M�tadonn�e
+This name is already used;Ce nom est d�ja utilis�
+Name of the folder;Nom du r�pertoire
+Optional;Optionel
+Teaser;Courte description

core/views/folder/createfolder.phtml

@@ -20,7 +20,15 @@ echo '<script type="text/javascript" src="' . $this->coreWebroot . '/public/js/j
    <input type="hidden" name="folderId" value="<?php echo $this->parentFolder->getKey()?>"/>
       <div >
         <label for="name"><?php echo $this->t("Name")?></label>
-        <input type='text' name="name"/>
+        <?php echo $this->form['name']?>
+      </div>
+      <div >
+        <label for="description"><?php echo $this->t("Description")?></label>
+        <?php echo $this->form['description']?>
+      </div>
+      <div >
+        <label for="teaser"><?php echo $this->t("Teaser")?></label>
+        <?php echo $this->form['teaser']?>
       </div>
 
       <div>