* Finish task #4544.

module/product/control.php

@@ -558,11 +558,12 @@ class product extends control
         $output = html::select($field, $plans, $planID, "class='form-control chosen'");
         if(count($plans) == 1 and $needCreate)
         {
-            $output .= "<span class='input-group-addon'>";
-            $output .= html::a($this->createLink('productplan', 'create', "productID=$productID&branch=$branch"), $this->lang->productplan->create, '_blank');
-            $output .= '&nbsp; ';
-            $output .= html::a("javascript:loadProductPlans($productID)", $this->lang->refresh);
-            $output .= '</span>';
+            $output .= "<div class='input-group-btn'>";
+            $output .= html::a($this->createLink('productplan', 'create', "productID=$productID&branch=$branch", '', true), "<i class='icon icon-plus'></i>", '', "class='btn btn-icon' data-toggle='modal' data-type='iframe' data-width='95%' title='{$this->lang->productplan->create}'");
+            $output .= '</div>';
+            $output .= "<div class='input-group-btn'>";
+            $output .= html::a("#", "<i class='icon icon-refresh'></i>", '', "class='btn btn-icon refresh' data-toggle='tooltip' title='{$this->lang->refresh}' onclick='loadProductPlans($productID)'");
+            $output .= '</div>';
         }
         die($output);
     }

module/product/view/create.html.php

@@ -38,9 +38,9 @@
                 if(count($lines) == 1)
                 {
                     echo "<span class='input-group-addon'>";
-                    echo html::a($this->createLink('tree', 'browse', "rootID=$rootID&view=line"), $lang->tree->manageLine, '_blank');
+                    echo html::a($this->createLink('tree', 'browse', "rootID=$rootID&view=line", '', true), $lang->tree->manageLine, '', "class='text-primary' data-toggle='modal' data-type='iframe' data-width='95%'");
                     echo '&nbsp; ';
-                    echo html::a("javascript:loadProductLines({$rootID})", $lang->refresh, '', "class='refresh'");
+                    echo html::a("#", $lang->refresh, '', "class='refresh' onclick='loadProductLines($rootID)'");
                     echo '</span>';
                 }
                 ?>

module/tree/control.php

@@ -296,6 +296,9 @@ class tree extends control
         if(!empty($_POST))
         {
             $this->tree->manageChild($rootID, $viewType);
+
+            if(isonlybody()) die(js::closeModal('parent.parent', '', "function(){parent.parent.$('a.refresh').click()}"));
+
             die(js::reload('parent'));
         }
     }
@@ -357,9 +360,9 @@ class tree extends control
             if(count($optionMenu) == 1 and $needManage)
             {
                 $output .=  "<span class='input-group-addon'>";
-                $output .= html::a($this->createLink('tree', 'browse', "rootID=$rootID&view=$viewType&currentModuleID=0&branch=$branch"), $viewType == 'line' ? $this->lang->tree->manageLine : $this->lang->tree->manage, '_blank');
+                $output .= html::a($this->createLink('tree', 'browse', "rootID=$rootID&view=$viewType&currentModuleID=0&branch=$branch", '', true), $viewType == 'line' ? $this->lang->tree->manageLine : $this->lang->tree->manage, '', "class='text-primary' data-toggle='modal' data-type='iframe' data-width='95%'");
                 $output .= '&nbsp; ';
-                $output .= $viewType == 'line' ? html::a("javascript:loadProductLines($rootID)", $this->lang->refresh) : html::a("javascript:loadProductModules($rootID)", $this->lang->refresh);
+                $output .= $viewType == 'line' ? html::a("#", $this->lang->refresh, '', "class='refresh' onclick='loadProductLines($rootID)'") : html::a("#", $this->lang->refresh, '', "class='refresh' onclick='loadProductModules($rootID)'");
                 $output .= '</span>';
             }
             die($output);

module/tree/css/common.css

@@ -17,3 +17,5 @@
 #modulesTree li > .list-toggle {top: 0}
 
 #childrenForm table tr > td.text-middle span{display:block; float:left;}
+
+.body-modal #mainMenu{display: none;}

module/tree/view/browse.html.php

@@ -22,7 +22,8 @@
     </a>
     <div class="divider"></div>
     <div class="page-title">
-      <span class="text" title='<?php echo $root->name;?>'>
+    <?php $rootName = $viewType == 'line' ? '' : $root->name;?>
+      <span class="text" title='<?php echo $rootName;?>'>
         <?php
         if($viewType == 'doc')
         {