Index: grade/lib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/grade/lib.php,v
retrieving revision 1.120.2.21
diff -u -r1.120.2.21 lib.php
--- grade/lib.php	11 Mar 2008 23:58:51 -0000	1.120.2.21
+++ grade/lib.php	7 Oct 2008 11:10:50 -0000
@@ -442,6 +442,15 @@
             $count++;
         }

+        if (has_capability('moodle/grade:manage', $context)) {
+            $url = 'edit/weights/index.php?id='.$courseid;
+            if ($active_type == 'edit' and $active_plugin == 'weights' ) {
+                $active = $url;
+            }
+            $menu[$url] = get_string('weights', 'grades');
+            $count++;
+        }
+
     }

Index: grade/edit/weights/ajax.php
===================================================================
RCS file: grade/edit/weights/ajax.php
diff -N grade/edit/weights/ajax.php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ grade/edit/weights/ajax.php	7 Oct 2008 11:10:51 -0000
@@ -0,0 +1,71 @@
+<script type="text/javascript">
+//<![CDATA[
+
+// If the mouse is clicked outside this element, the edit is CANCELLED (even if the mouse clicks another grade/feedback cell)
+// If ctrl-arrow is used, or if [tab] or [enter] are pressed, the edit is RECORDED and the row is updated. The previous element returns to normal
+
+YAHOO.namespace("grade_edit_weights");
+YAHOO.grade_edit_weights.courseid = <?php echo $COURSE->id; ?>;
+YAHOO.grade_edit_weights.wwwroot = '<?php echo $CFG->wwwroot; ?>';
+YAHOO.grade_edit_weights.tree = null;
+YAHOO.grade_edit_weights.treedata = <?php echo $tree_json; ?>;
+
+YAHOO.grade_edit_weights.buildTreeNode = function(element, parentNode) {
+    var gew = YAHOO.grade_edit_weights;
+
+    if (parentNode === undefined) {
+        parentNode = gew.tree.getRoot();
+    }
+
+    if (element === undefined) {
+        element = gew.treedata;
+    }
+
+    if (element.item.table == 'grade_categories') {
+        var aggregation_types = '<select name="aggregation_'+element.item.id+'">';
+
+        for (var i = 0; i < gew.options.length; i++) {
+            aggregation_types += '<option>' + gew.options[i] + '</option>';
+        }
+
+        var gradecategory = '<span class="gradecategory">'+element.item.name+' '+aggregation_types+'<'+'/span>';
+        var tmpNode = new YAHOO.widget.TextNode(gradecategory, parentNode, parentNode.isRoot());
+        // var tmpNode = new YAHOO.widget.TextNode(element.item.name, parentNode, parentNode.isRoot());
+        for (var i = 0; i < element.children.length; i++) {
+            gew.buildTreeNode(element.children[i], tmpNode, false);
+        }
+    } else if (element.item.itemtype == 'mod') {
+        var gradeitem = '<span class="gradeitem"><input type="text" size="6" name="weight_'+element.item.id+'" value="'+element.item.aggregationcoef+'"/>'+
+                        element.item.name + '<'+'/span>';
+        var tmpNode = new YAHOO.widget.HTMLNode(gradeitem, parentNode, false);
+    }
+};
+
+YAHOO.grade_edit_weights.init = function() {
+    var gew = YAHOO.grade_edit_weights;
+    var div = document.getElementById('weightstree');
+    gew.tree = new YAHOO.widget.TreeView('gradetree');
+
+    //handler for expanding all nodes
+    YAHOO.util.Event.on("expand", "click", function(e) {
+        YAHOO.log("Expanding all TreeView  nodes.", "info", "example");
+        gew.tree.expandAll();
+        YAHOO.util.Event.preventDefault(e);
+    });
+
+    //handler for collapsing all nodes
+    YAHOO.util.Event.on("collapse", "click", function(e) {
+        YAHOO.log("Collapsing all TreeView  nodes.", "info", "example");
+        gew.tree.collapseAll();
+        YAHOO.util.Event.preventDefault(e);
+    });
+
+    // gew.buildTreeNode();
+    gew.tree.render();
+    gew.tree.expandAll();
+};
+
+YAHOO.util.Event.onDOMReady(YAHOO.grade_edit_weights.init);
+
+// ]]>
+</script>
Index: grade/edit/weights/index.php
===================================================================
RCS file: grade/edit/weights/index.php
diff -N grade/edit/weights/index.php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ grade/edit/weights/index.php	7 Oct 2008 11:10:51 -0000
@@ -0,0 +1,188 @@
+<?php  // $Id: index.php,v 1.12.2.5 2008/02/17 19:11:29 skodak Exp $
+
+///////////////////////////////////////////////////////////////////////////
+//                                                                       //
+// NOTICE OF COPYRIGHT                                                   //
+//                                                                       //
+// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
+//          http://moodle.com                                            //
+//                                                                       //
+// Copyright (C) 1999 onwards  Martin Dougiamas  http://moodle.com       //
+//                                                                       //
+// This program is free software; you can redistribute it and/or modify  //
+// it under the terms of the GNU General Public License as published by  //
+// the Free Software Foundation; either version 2 of the License, or     //
+// (at your option) any later version.                                   //
+//                                                                       //
+// This program is distributed in the hope that it will be useful,       //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
+// GNU General Public License for more details:                          //
+//                                                                       //
+//          http://www.gnu.org/copyleft/gpl.html                         //
+//                                                                       //
+///////////////////////////////////////////////////////////////////////////
+
+require_once '../../../config.php';
+require_once $CFG->dirroot.'/grade/lib.php';
+require_once $CFG->dirroot.'/grade/report/lib.php'; // for preferences
+
+$courseid = required_param('id', PARAM_INT);
+$action   = optional_param('action', 0, PARAM_ALPHA);
+$eid      = optional_param('eid', 0, PARAM_ALPHANUM);
+
+require_js(array('yui_yahoo', 'yui_dom', 'yui_event', 'yui_json', 'yui_connection', 'yui_dragdrop', 'yui_treeview'));
+
+/// Make sure they can even access this course
+
+if (!$course = get_record('course', 'id', $courseid)) {
+    print_error('nocourseid');
+}
+
+require_login($course);
+$context = get_context_instance(CONTEXT_COURSE, $course->id);
+require_capability('moodle/grade:manage', $context);
+
+/// return tracking object
+$gpr = new grade_plugin_return(array('type'=>'edit', 'plugin'=>'weights', 'courseid'=>$courseid));
+$returnurl = $gpr->get_return_url(null);
+
+//first make sure we have proper final grades - we need it for locking changes
+grade_regrade_final_grades($courseid);
+
+// get the grading tree object
+// note: total must be first for moving to work correctly, if you want it last moving code must be rewritten!
+$gtree = new grade_tree($courseid, false, false);
+
+$switch = grade_get_setting($course->id, 'aggregationposition', $CFG->grade_aggregationposition);
+
+$strgrades             = get_string('grades');
+$strgraderreport       = get_string('graderreport', 'grades');
+$strcategoriesedit     = get_string('categoriesedit', 'grades');
+$strcategoriesanditems = get_string('categoriesanditems', 'grades');
+
+$navigation = grade_build_nav(__FILE__, $strcategoriesanditems, array('courseid' => $courseid));
+$moving = false;
+
+$CFG->stylesheets[] = $CFG->wwwroot.'/grade/edit/weights/tree.css';
+print_header_simple($strgrades . ': ' . $strgraderreport, ': ' . $strcategoriesedit, $navigation, '', '', true, '', navmenu($course));
+
+/// Print the plugin selector at the top
+print_grade_plugin_selector($courseid, 'edit', 'tree');
+
+print_heading(get_string('categoriesedit', 'grades'));
+$tree_json = json_encode(get_tree_json($gtree, $gtree->top_element));
+
+$form_key = optional_param('sesskey', null, PARAM_ALPHANUM);
+
+if ($form_key) {
+    $data = data_submitted();
+
+    foreach ($data as $key => $value) {
+        if (preg_match('/aggregation_type_([0-9])*/', $key, $matches)) {
+
+        } elseif (preg_match('/aggregation_type_([0-9])*/', $key, $matches)) {
+
+        }
+    }
+
+    print_object($data);
+    die();
+}
+
+// AJAX interface not really needed: adds nice tree functions but not very useful
+// require_once('ajax.php');
+
+print_box_start('gradetreebox generalbox');
+
+echo '<div id="expandcontractdiv">
+       <a id="expand" href="#">Expand all</a>
+	    <a id="collapse" href="#">Collapse all</a>
+	</div> ';
+
+echo '<form method="post" action="'.$returnurl.'">';
+echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
+echo '<div id="gradetree">';
+echo build_html_tree(get_tree_json($gtree, $gtree->top_element));
+
+// print_grade_tree($gtree, $gtree->top_element, $gpr, $switch);
+//
+echo '</div><div>';
+
+echo '<input type="submit" value="Update weights" />';
+echo '</div></form>';
+print_box_end();
+
+print_footer($course);
+die;
+
+function get_tree_json(&$gtree, $element, $totals=false) {
+
+    $return_array = array();
+
+    $object = $element['object'];
+    $eid    = $element['eid'];
+    $object->name = $gtree->get_element_header($element, false, false, false);
+
+    $return_array['item'] = $object;
+
+    if ($element['type'] == 'category') {
+        foreach($element['children'] as $child_el) {
+            if (!empty($child_el['object']->itemtype) && ($child_el['object']->itemtype == 'course' || $child_el['object']->itemtype == 'category') && !$totals) {
+                continue;
+            }
+            $return_array['children'][] = get_tree_json($gtree, $child_el);
+        }
+    }
+
+    return $return_array;
+}
+
+function build_html_tree($tree, $element=null) {
+    $options = array(GRADE_AGGREGATE_MEAN            =>get_string('aggregatemean', 'grades'),
+                     GRADE_AGGREGATE_WEIGHTED_MEAN   =>get_string('aggregateweightedmean', 'grades'),
+                     GRADE_AGGREGATE_WEIGHTED_MEAN2  =>get_string('aggregateweightedmean2', 'grades'),
+                     GRADE_AGGREGATE_EXTRACREDIT_MEAN=>get_string('aggregateextracreditmean', 'grades'),
+                     GRADE_AGGREGATE_MEDIAN          =>get_string('aggregatemedian', 'grades'),
+                     GRADE_AGGREGATE_MIN             =>get_string('aggregatemin', 'grades'),
+                     GRADE_AGGREGATE_MAX             =>get_string('aggregatemax', 'grades'),
+                     GRADE_AGGREGATE_MODE            =>get_string('aggregatemode', 'grades'),
+                     GRADE_AGGREGATE_SUM             =>get_string('aggregatesum', 'grades'));
+
+    $html = '';
+    $root = false;
+
+    if (is_null($element)) {
+        $html .= "<ul>\n";
+        $element = $tree;
+        $root = true;
+    }
+
+    $html .= "<li>\n";
+
+    if (!empty($element['children'])) { // Grade category
+        $aggregation_type = choose_from_menu($options, 'aggregation_type_'.$element['item']->id, $element['item']->aggregation, get_string('choose'), null,
+            0, true);
+
+        $html .= $element['item']->name . $aggregation_type . "<ul>\n";
+
+        foreach ($element['children'] as $child) {
+            $html .= build_html_tree($tree, $child);
+        }
+
+        $html .= "</ul>\n";
+    } else {
+        $html .= '<span class="gradeitem">' . "\n"
+              . '<input type="text" size="6" name="weight_'.$element['item']->id.'" value="'.$element['item']->aggregationcoef.'" />' . "\n"
+              . $element['item']->name . "</span>\n";
+    }
+
+    $html .= "</li>\n";
+
+    if ($root) {
+        $html .= "</ul>\n";
+    }
+
+    return $html;
+}
+?>
Index: grade/edit/weights/tree.css
===================================================================
RCS file: grade/edit/weights/tree.css
diff -N grade/edit/weights/tree.css
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ grade/edit/weights/tree.css	7 Oct 2008 11:10:51 -0000
@@ -0,0 +1,140 @@
+/* Copyright (c) 2006 Yahoo! Inc. All rights reserved. */
+
+/* first or middle sibling, no children */
+.ygtvtn {
+    background: url(img/tn.gif) 0 0 no-repeat;
+    width:17px;
+    height:22px;
+}
+
+/* first or middle sibling, collapsable */
+.ygtvtm {
+    background: url(img/tm.gif) 0 0 no-repeat;
+    width:34px;
+    height:22px; cursor:pointer
+}
+
+/* first or middle sibling, collapsable, hover */
+.ygtvtmh {
+    background: url(img/tmh.gif) 0 0 no-repeat;
+    width:34px;
+    height:22px;
+    cursor:pointer
+}
+
+/* first or middle sibling, expandable */
+.ygtvtp {
+    background: url(img/tp.gif) 0 0 no-repeat;
+    width:34px;
+    height:22px;
+    cursor:pointer
+}
+
+/* first or middle sibling, expandable, hover */
+.ygtvtph {
+    background: url(img/tph.gif) 0 0 no-repeat;
+    width:34px;
+    height:22px;
+    cursor:pointer
+}
+
+/* last sibling, no children */
+.ygtvln {
+    background: url(img/ln.gif) 0 0 no-repeat;
+    width:17px;
+    height:22px;
+}
+
+/* Last sibling, collapsable */
+.ygtvlm {
+    background: url(img/lm.gif) 0 0 no-repeat;
+
+   width:34px;
+   height:22px;
+   cursor:pointer
+}
+
+/* Last sibling, collapsable, hover */
+.ygtvlmh {
+    background: url(img/lmh.gif) 0 0 no-repeat;
+    width:34px;
+    height:22px;
+    cursor:pointer
+}
+
+/* Last sibling, expandable */
+.ygtvlp {
+    background: url(img/lp.gif) 0 0 no-repeat;
+    width:34px;
+    height:22px;
+    cursor:pointer
+}
+
+/* Last sibling, expandable, hover */
+.ygtvlph {
+    background: url(img/lph.gif) 0 0 no-repeat;
+    width:34px;
+    height:22px;
+    cursor:pointer
+}
+
+/* Loading icon */
+.ygtvloading {
+    background: url(img/loading.gif) 0 0 no-repeat;
+    width:16px;
+    height:22px;
+}
+
+/* the style for the empty cells that are used for rendering the depth
+ * of the node */
+.ygtvdepthcell {
+    background: url(img/vline.gif) 0 0 no-repeat;
+    width:17px;
+    height:22px;
+}
+
+.ygtvblankdepthcell {
+    width:17px;
+    height:22px;
+}
+
+/* the style of the div around each node */
+.ygtvitem { }
+
+.ygtvitem table{
+    margin-bottom:0;
+}
+.ygtvitem td {
+    border:none;padding:0;
+}
+
+
+
+/* the style of the div around each node's collection of children */
+.ygtvchildren { }
+* html .ygtvchildren {
+    height:1%;
+}
+
+/* the style of the text label in ygTextNode */
+.ygtvlabel, .ygtvlabel:link, .ygtvlabel:visited, .ygtvlabel:hover {
+ margin-left:2px;
+ text-decoration: none;
+}
+
+#expandcontractdiv {
+    border:1px dotted #dedede;
+    background-color:#EBE4F2;
+    margin:0 0 .5em 0;
+    padding:0.4em;
+}
+
+#weightstree {
+    background: #fff;
+    padding:1em;
+    margin-top:1em;
+}
+
+span.gradeitem input {
+    margin-right: 15px;
+}
Index: grade/edit/weights/img/lm.gif
===================================================================
RCS file: grade/edit/weights/img/lm.gif
diff -N grade/edit/weights/img/lm.gif
Binary files /dev/null and lm.gif differ
Index: grade/edit/weights/img/lmh.gif
===================================================================
RCS file: grade/edit/weights/img/lmh.gif
diff -N grade/edit/weights/img/lmh.gif
Binary files /dev/null and lmh.gif differ
Index: grade/edit/weights/img/ln.gif
===================================================================
RCS file: grade/edit/weights/img/ln.gif
diff -N grade/edit/weights/img/ln.gif
Binary files /dev/null and ln.gif differ
Index: grade/edit/weights/img/loading.gif
===================================================================
RCS file: grade/edit/weights/img/loading.gif
diff -N grade/edit/weights/img/loading.gif
Binary files /dev/null and loading.gif differ
Index: grade/edit/weights/img/lp.gif
===================================================================
RCS file: grade/edit/weights/img/lp.gif
diff -N grade/edit/weights/img/lp.gif
Binary files /dev/null and lp.gif differ
Index: grade/edit/weights/img/lph.gif
===================================================================
RCS file: grade/edit/weights/img/lph.gif
diff -N grade/edit/weights/img/lph.gif
Binary files /dev/null and lph.gif differ
Index: grade/edit/weights/img/tm.gif
===================================================================
RCS file: grade/edit/weights/img/tm.gif
diff -N grade/edit/weights/img/tm.gif
Binary files /dev/null and tm.gif differ
Index: grade/edit/weights/img/tmh.gif
===================================================================
RCS file: grade/edit/weights/img/tmh.gif
diff -N grade/edit/weights/img/tmh.gif
Binary files /dev/null and tmh.gif differ
Index: grade/edit/weights/img/tn.gif
===================================================================
RCS file: grade/edit/weights/img/tn.gif
diff -N grade/edit/weights/img/tn.gif
Binary files /dev/null and tn.gif differ
Index: grade/edit/weights/img/tp.gif
===================================================================
RCS file: grade/edit/weights/img/tp.gif
diff -N grade/edit/weights/img/tp.gif
Binary files /dev/null and tp.gif differ
Index: grade/edit/weights/img/tph.gif
===================================================================
RCS file: grade/edit/weights/img/tph.gif
diff -N grade/edit/weights/img/tph.gif
Binary files /dev/null and tph.gif differ
Index: grade/edit/weights/img/vline.gif
===================================================================
RCS file: grade/edit/weights/img/vline.gif
diff -N grade/edit/weights/img/vline.gif
Binary files /dev/null and vline.gif differ
Index: lang/en_utf8/grades.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/grades.php,v
retrieving revision 1.111.2.55
diff -u -r1.111.2.55 grades.php
--- lang/en_utf8/grades.php	4 Jul 2008 20:48:18 -0000	1.111.2.55
+++ lang/en_utf8/grades.php	7 Oct 2008 11:11:03 -0000
@@ -515,6 +515,7 @@
 $string['weighteddescending'] = 'Sort by weighted percent descending';
 $string['weightedpct'] = 'weighted %%';
 $string['weightedpctcontribution'] = 'weighted %% contribution';
+$string['weights'] = 'weights';
 $string['writinggradebookinfo'] = 'Writing gradebook settings';
 $string['xml'] = 'XML';
 $string['yes'] = 'Yes';