Undo changes due recent merge

.gitignore

@@ -1,22 +1,10 @@
 # Chamilo configuration
 main/inc/conf
-<<<<<<< HEAD
 app/cache/*
 app/config/*
 app/data/*
 app/logs/*
 
-# Temp directories
-archive/*
-archive/.htaccess
-archive/index.html
-=======
-
-# Temp directories
-archive/*
-!archive/.htaccess
->>>>>>> julio19x
-
 # Courses
 
 courses/*
@@ -44,10 +32,5 @@ searchdb/*
 .idea/cssxfire.xml
 
 *.orig
-<<<<<<< HEAD
 nbproject/*
-
 vendor/.git
-=======
-nbproject/*
->>>>>>> julio19x

main/css/base.css

@@ -262,27 +262,10 @@ form .formw input {
     margin-top: 2px;
 }
 
-<<<<<<< HEAD
 #accept_licence, #checkbox {
     margin-right: 5px;
     margin-top: -1px;
-=======
-/* end chamilo forms fixes */
-
-#top_main_content .span3 {
-  float: left;
-}
-#top_main_content .control-group .span3 {
-  float: none;
 }
-#top_main_content .span9 {
-  float: left;
-}
-#top_main_content .span6 {
-  width: 460px;
->>>>>>> julio19x
-}
-
 /* end chamilo forms fixes */
 
 /* New changes Chamilo 1.9 */

main/document/document.php

@@ -1268,7 +1268,6 @@ $table_footer = '';
 $total_size = 0;
 
 if (isset($docs_and_folders) && is_array($docs_and_folders)) {
-<<<<<<< HEAD
     if (api_get_group_id() == 0 || (api_is_allowed_to_edit() || GroupManager::is_subscribed(
         api_get_user_id(),
         api_get_group_id()
@@ -1276,9 +1275,6 @@ if (isset($docs_and_folders) && is_array($docs_and_folders)) {
         api_get_user_id()
     ))
     ) {
-=======
-    if (api_get_group_id() == 0 || ( api_is_allowed_to_edit() || GroupManager::is_subscribed(api_get_user_id(), api_get_group_id()) || GroupManager :: is_tutor_of_group(api_get_user_id(), api_get_group_id()))) {
->>>>>>> julio19x
         // Create a sortable table with our data
         $sortable_data = array();
 

main/gradebook/lib/be/category.class.php

@@ -627,7 +627,6 @@ class Category implements GradebookItem
      * A category is a course if it has a course code and no parent category.
      */
     public function is_course() {
-<<<<<<< HEAD
         return (isset($this->course_code) && !empty($this->course_code)
             && (!isset($this->parent) || $this->parent == 0));
     }
@@ -654,40 +653,6 @@ class Category implements GradebookItem
         $rescount     = 0;
         $ressum       = 0;
         $weightsum    = 0;
-=======
-        return (isset($this->course_code) && !empty($this->course_code)
-            && (!isset($this->parent) || $this->parent == 0));
-    }
-
-    /**
-     * Calculate the score of this category
-     * @param $stud_id student id (default: all students - then the average is returned)
-     * @return    array (score sum, weight sum)
-     *             or null if no scores available
-     */
-    public function calc_score ($stud_id = null, $course_code = '', $session_id = null) {
-        // get appropriate subcategories, evaluations and links
-        if (!empty($course_code)) {
-            $cats  = $this->get_subcategories($stud_id, $course_code, $session_id);
-            $evals = $this->get_evaluations($stud_id, false, $course_code);
-            $links = $this->get_links($stud_id, false, $course_code);
-        } else {
-            $cats  = $this->get_subcategories($stud_id);
-            $evals = $this->get_evaluations($stud_id);
-            $links = $this->get_links($stud_id);
-        }
-
-        // calculate score
-        $rescount     = 0;
-        $ressum       = 0;
-        $weightsum    = 0;
-        /*$debug = false;
-
-        if ($stud_id == 11) {
-            $debug = true;
-        }
-        if ($debug) var_dump($links);*/
->>>>>>> julio19x
 
         if (!empty($cats)) {
             foreach ($cats as $cat) {
@@ -700,28 +665,6 @@ class Category implements GradebookItem
                 if (isset($catres)) {
                     $ressum += (($catres[0]/$catres[1]) * $catweight);
                 }
-<<<<<<< HEAD
-			}
-		}
-
-		if (!empty($evals)) {
-			foreach ($evals as $eval) {
-				$evalres = $eval->calc_score($stud_id);
-				if (isset($evalres) && $eval->get_weight() != 0) {
-					$evalweight = $eval->get_weight();
-					$rescount++;
-					$weightsum += $evalweight;
-					$ressum += (($evalres[0]/$evalres[1]) * $evalweight);
-				} else {
-
-				}
-			}
-		}
-
-		if (!empty($links)) {
-			foreach ($links as $link) {
-				$linkres = $link->calc_score($stud_id);
-=======
             }
         }
 
@@ -742,8 +685,6 @@ class Category implements GradebookItem
         if (!empty($links)) {
             foreach ($links as $link) {
                 $linkres = $link->calc_score($stud_id);
-                //if ($debug) var_dump($linkres);
->>>>>>> julio19x
 
                 if (isset($linkres) && $link->get_weight() != 0) {
                     $linkweight     = $link->get_weight();

main/gradebook/lib/fe/evalform.class.php

@@ -466,7 +466,6 @@ class EvalForm extends FormValidator
                 }
             }
         }
-<<<<<<< HEAD
 
         $this->add_textfield('weight_mask', array(get_lang('Weight'), null, ' [0 .. '.$all_categories[0]->get_weight().'] '), true, array (
                 'size' => '4',
@@ -474,28 +473,13 @@ class EvalForm extends FormValidator
                 'class' => 'span1'
             ));
 
-=======
-        
-        $this->add_textfield('weight_mask', array(get_lang('Weight'), null, ' [0 .. '.$all_categories[0]->get_weight().'] '), true, array (
-            'size' => '4',
-            'maxlength' => '5',
-            'class' => 'span1'
-        ));
-        
->>>>>>> julio19x
         /*$this->add_textfield('weight', array(null, null, '/ <span id="max_weight">'.$default_weight.'</span>'), true, array (
             	'size' => '4',
 			'maxlength' => '5',
             'class' => 'span1'
-<<<<<<< HEAD
-		));*/
-
-
-=======
 		));*/
 
 
->>>>>>> julio19x
         if ($edit) {
             if (!$this->evaluation_object->has_results()) {
                 $this->add_textfield('max', get_lang('QualificationNumeric'), true, array (