diff --git a/module/tree/css/edit.css b/module/tree/css/edit.css new file mode 100644 index 0000000000..0037a851da --- /dev/null +++ b/module/tree/css/edit.css @@ -0,0 +1 @@ +body{background:white; overflow:none} diff --git a/module/tree/js/browse.js b/module/tree/js/browse.js new file mode 100644 index 0000000000..92e111dec0 --- /dev/null +++ b/module/tree/js/browse.js @@ -0,0 +1,25 @@ +function syncModule() +{ + link = createLink('tree', 'ajaxGetSonModules', 'moduleID=' + $('#productModule').val() + '&rootID=' + rootID); + $.getJSON(link, function(modules) + { + $('.helplink').addClass('hidden'); + $.each(modules, function(key, value) + { + moduleName = value; + $('.text-3').each(function() + { + if(this.value == moduleName) modules[key] = null; + if(!this.value) $(this).parent().addClass('hidden'); + }) + }); + $.each(modules, function(key, value) + { + if(value) $('#moduleBox').append("
"); + }) + }) +} +$(document).ready(function() +{ + $("a.iframe").colorbox({width:480, height:240, iframe:true, transition:'none'}); +}); diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php index e39cdf940b..58aaefbb24 100644 --- a/module/tree/view/browse.html.php +++ b/module/tree/view/browse.html.php @@ -12,102 +12,74 @@ ?> - -
-
-
-
id}&viewType=$viewType");?>'> - - - - - - - - - -
tree->manageChild;?>
- - createLink('tree', 'browse', "root={$root->id}&viewType=$viewType"), $root->name); - echo $lang->arrow; - foreach($parentModules as $module) - { - echo html::a($this->createLink('tree', 'browse', "root={$root->id}&viewType=$viewType&moduleID=$module->id"), $module->name); - echo $lang->arrow; - } - ?> - - - tree->syncFromProduct, 'onclick=syncModule()'); - echo '
'; - } - $maxOrder = 0; - foreach($sons as $sonModule) - { - if($sonModule->order > $maxOrder) $maxOrder = $sonModule->order; - echo '' . html::input("modules[id$sonModule->id]", $sonModule->name, 'class=text-3 style="margin-bottom:5px"') . '
'; - } - for($i = 0; $i < TREE::NEW_CHILD_COUNT ; $i ++) echo '' . html::input("modules[]", '', 'class=text-3 style="margin-bottom:5px"') . '
'; - ?> -
- - -
+ + + + + + + +
+ id}&viewType=$viewType");?>'> + + + + + +
title;?>
+
+
+ tree->updateOrder);?> +
+
- - - -
-
id}&viewType=$viewType");?>'> - - - - - -
title;?>
-
-
- tree->updateOrder);?> -
-
-
-
- - +
+
id}&viewType=$viewType");?>'> + + + + + + + + + +
tree->manageChild;?>
+ + createLink('tree', 'browse', "root={$root->id}&viewType=$viewType"), $root->name); + echo $lang->arrow; + foreach($parentModules as $module) + { + echo html::a($this->createLink('tree', 'browse', "root={$root->id}&viewType=$viewType&moduleID=$module->id"), $module->name); + echo $lang->arrow; + } + ?> + + + tree->syncFromProduct, 'onclick=syncModule()'); + echo '
'; + } + $maxOrder = 0; + foreach($sons as $sonModule) + { + if($sonModule->order > $maxOrder) $maxOrder = $sonModule->order; + echo '' . html::input("modules[id$sonModule->id]", $sonModule->name, 'class=text-3 style="margin-bottom:5px"') . '
'; + } + for($i = 0; $i < TREE::NEW_CHILD_COUNT ; $i ++) echo '' . html::input("modules[]", '', 'class=text-3 style="margin-bottom:5px"') . '
'; + ?> +
+ + +
+
+
diff --git a/module/tree/view/edit.html.php b/module/tree/view/edit.html.php index 68c2bc8b84..b7d8411219 100644 --- a/module/tree/view/edit.html.php +++ b/module/tree/view/edit.html.php @@ -11,30 +11,28 @@ */ ?> - -
-
- - - - - - - - - - - type == 'bug'):?> - - - - - - - - -
tree->edit;?>
tree->parent;?>parent, "class='select-1'");?>
tree->name;?>name, "class='text-1'");?>
tree->owner;?>owner, "class='select-1'");?>
- -
-
-
+
+ + + + + + + + + + + type == 'bug'):?> + + + + + + + + +
tree->edit;?>
tree->parent;?>parent, "class='select-1'");?>
tree->name;?>name, "class='text-1'");?>
tree->owner;?>owner, "class='select-1'");?>
+ +
+
+