| {$widget->title}
@@ -79,12 +79,12 @@
-
-
+
+
- CSS
+ CSS - layout.css
-
+
diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php
index bb31d60b6..1b951187f 100644
--- a/modules/member/member.admin.controller.php
+++ b/modules/member/member.admin.controller.php
@@ -1115,6 +1115,7 @@ class memberAdminController extends member
}
if(!$args->group_srl) $args->group_srl = getNextSequence();
+ $args->list_order = $args->group_srl;
$output = executeQuery('member.insertGroup', $args);
$this->_deleteMemberGroupCache($args->site_srl);
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index 9e3b3fa25..e3d93b8f5 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -722,6 +722,8 @@ class memberController extends member
elseif($type == 2) $ext = 'jpg';
else $ext = 'gif';
+ FileHandler::removeFilesInDir($target_path);
+
$target_filename = sprintf('%s%d.%s', $target_path, $member_srl, $ext);
// Convert if the image size is larger than a given size or if the format is not a gif
if($width > $max_width || $height > $max_height || $type!=1) FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, $ext);
diff --git a/modules/menu/tpl/sitemap.html b/modules/menu/tpl/sitemap.html
index 2771ec8cb..0f9be119a 100644
--- a/modules/menu/tpl/sitemap.html
+++ b/modules/menu/tpl/sitemap.html
@@ -767,6 +767,7 @@ function onSiteMapReceived(htData){
}
var sInitiallyOpen = [];
+ $.jstree.defaults.ui.select_limit = 1;
$("#siteMapTree")
.jstree({
@@ -1321,9 +1322,7 @@ jQuery(function($){
});
});
- //$.jstree._themes = "PATH/TO/FOLDER/";
- //$.jstree._themes = "/maserati/modules/menu/tpl/css/themes/";
- $.jstree._themes = '{getNotEncodedFullUrl("")}/modules/menu/tpl/css/themes/';
+ $.jstree._themes = '{getNotEncodedFullUrl("")}modules/menu/tpl/css/themes/';
$(document.body).on("click", ".x div.col a, .x div.col button", function(ev){
// FF keeps the focus, making the button highlighted even after the panel is closed.
diff --git a/modules/module/module.class.php b/modules/module/module.class.php
index 232a83205..b02c8c448 100644
--- a/modules/module/module.class.php
+++ b/modules/module/module.class.php
@@ -454,6 +454,7 @@ class module extends ModuleObject
{
$oModuleModel = getModel('module');
$oModuleModel->getModuleList();
+ $oModuleModel->loadModuleExtends();
}
}
/* End of file module.class.php */