Fixing templates with recent changes.

main/template/default/admin/administrator/branches/add.tpl

@@ -1,5 +1,5 @@
 {% extends app.template_style ~ "/layout/layout_1_col.tpl" %}
 {% block content %}
-    {% import app.template_style ~ "/default_actions/settings.tpl" as actions %}
+    {% import app.template_style ~ "/crud_macros/simple_crud.tpl" as actions %}
     {{ actions.add(form, links) }}
 {% endblock %}

main/template/default/admin/administrator/juries/add.tpl

@@ -1,5 +1,5 @@
 {% extends app.template_style ~ "/layout/layout_1_col.tpl" %}
 {% block content %}
-    {% import app.template_style ~ "/default_actions/settings.tpl" as actions %}
+    {% import app.template_style ~ "/crud_macros/simple_crud.tpl" as actions %}
     {{ actions.add(form, links) }}
 {% endblock %}

main/template/default/admin/administrator/juries/edit.tpl

@@ -1,5 +1,5 @@
 {% extends app.template_style ~ "/layout/layout_1_col.tpl" %}
 {% block content %}
-    {% import app.template_style ~ "/default_actions/settings.tpl" as actions %}
+    {% import app.template_style ~ "/crud_macros/simple_crud.tpl" as actions %}
     {{ actions.edit(form, links) }}
 {% endblock %}

main/template/default/admin/administrator/question_score/add.tpl

@@ -1,5 +1,5 @@
 {% extends app.template_style ~ "/layout/layout_1_col.tpl" %}
 {% block content %}
-    {% import app.template_style ~ "/default_actions/settings.tpl" as actions %}
+    {% import app.template_style ~ "/crud_macros/simple_crud.tpl" as actions %}
     {{ actions.add(form, links) }}
 {% endblock %}

main/template/default/admin/administrator/question_score/edit.tpl

@@ -1,5 +1,5 @@
 {% extends app.template_style ~ "/layout/layout_1_col.tpl" %}
 {% block content %}
-    {% import app.template_style ~ "/default_actions/settings.tpl" as actions %}
+    {% import app.template_style ~ "/crud_macros/simple_crud.tpl" as actions %}
     {{ actions.edit(form, links) }}
 {% endblock %}

main/template/default/admin/administrator/question_score_name/add.tpl

@@ -1,5 +1,5 @@
 {% extends app.template_style ~ "/layout/layout_1_col.tpl" %}
 {% block content %}
-    {% import app.template_style ~ "/default_actions/settings.tpl" as actions %}
+    {% import app.template_style ~ "/crud_macros/simple_crud.tpl" as actions %}
     {{ actions.add(form, links) }}
 {% endblock %}

main/template/default/admin/administrator/question_score_name/edit.tpl

@@ -1,5 +1,5 @@
 {% extends app.template_style ~ "/layout/layout_1_col.tpl" %}
 {% block content %}
-    {% import app.template_style ~ "/default_actions/settings.tpl" as actions %}
+    {% import app.template_style ~ "/crud_macros/simple_crud.tpl" as actions %}
     {{ actions.edit(form, links) }}
 {% endblock %}

main/template/default/admin/administrator/question_score_name/list.tpl

@@ -1,5 +1,5 @@
 {% extends app.template_style ~ "/layout/layout_1_col.tpl" %}
 {% block content %}
-    {% import app.template_style ~ "/default_actions/settings.tpl" as actions %}
+    {% import app.template_style ~ "/crud_macros/simple_crud.tpl" as actions %}
     {{ actions.list(items, links) }}
 {% endblock %}

main/template/default/admin/administrator/question_score_name/read.tpl

@@ -1,5 +1,5 @@
 {% extends app.template_style ~ "/layout/layout_1_col.tpl" %}
 {% block content %}
-    {% import app.template_style ~ "/default_actions/settings.tpl" as actions %}
+    {% import app.template_style ~ "/crud_macros/simple_crud.tpl" as actions %}
     {{ actions.read(item, links) }}
 {% endblock %}

main/template/default/admin/administrator/role/add.tpl

@@ -1,5 +1,5 @@
 {% extends app.template_style ~ "/layout/layout_1_col.tpl" %}
 {% block content %}
-    {% import app.template_style ~ "/default_actions/settings.tpl" as actions %}
+    {% import app.template_style ~ "/crud_macros/simple_crud.tpl" as actions %}
     {{ actions.add(form, links) }}
 {% endblock %}

main/template/default/admin/administrator/role/edit.tpl

@@ -1,5 +1,5 @@
 {% extends app.template_style ~ "/layout/layout_1_col.tpl" %}
 {% block content %}
-    {% import app.template_style ~ "/default_actions/settings.tpl" as actions %}
+    {% import app.template_style ~ "/crud_macros/simple_crud.tpl" as actions %}
     {{ actions.edit(form, links) }}
 {% endblock %}

main/template/default/admin/administrator/role/list.tpl

@@ -1,5 +1,5 @@
 {% extends app.template_style ~ "/layout/layout_1_col.tpl" %}
 {% block content %}
-    {% import app.template_style ~ "/default_actions/settings.tpl" as actions %}
+    {% import app.template_style ~ "/crud_macros/simple_crud.tpl" as actions %}
     {{ actions.list(items, links) }}
 {% endblock %}

main/template/default/admin/administrator/role/read.tpl

@@ -1,5 +1,5 @@
 {% extends app.template_style ~ "/layout/layout_1_col.tpl" %}
 {% block content %}
-    {% import app.template_style ~ "/default_actions/settings.tpl" as actions %}
+    {% import app.template_style ~ "/crud_macros/simple_crud.tpl" as actions %}
     {{ actions.read(item, links) }}
 {% endblock %}

main/template/default/layout/menu.tpl

@@ -48,9 +48,8 @@
                             </a>
                         </li>
                     {% endif %}
-
                     <li>
-                        <a id="logout_button" class="logout" title="{{ "Logout"|get_lang }}" href="{{ logout_link }}" >
+                        <a id="logout_button" class="logout" title="{{ "Logout"|get_lang }}" href="{{ url('admin_logout') }}" >
                             <img src="{{ "exit.png"|icon(22) }}">
                         </a>
                     </li>

src/ChamiloLMS/Form/CurriculumItemRelUserType.php

@@ -17,7 +17,7 @@ class CurriculumItemRelUserType extends AbstractType
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('description', 'text', array('label' => ' ', 'attr' => array('class' => 'span8')));
+        $builder->add('description', 'text', array('label' => ' ', 'attr' => array('class' => 'span7')));
         $builder->add('item_id', 'hidden', array('attr' => array('value' => $this->itemId)));
     }