Merge pull request #2 from xpressengine/develop

Develop

modules/member/lang/lang.xml

@@ -2801,4 +2801,9 @@
 		<value xml:lang="en"><![CDATA[Completed.]]></value>
 		<value xml:lang="jp"><![CDATA[完了しました。]]></value>
 	</item>
+	<item name="warn_member_setting">
+		<value xml:lang="ko"><![CDATA[주의! 현재 설정이 사이트의 회원 가입을 허용하고 있지 않고 있다는 것을 명심하십시오.]]></value>
+		<value xml:lang="en"><![CDATA[Warning! Please remember current site setting doesn't accept new member.]]></value>
+		<value xml:lang="jp"><![CDATA[注意！現在のサイト設定は、会員登録を許可していないということを覚えなさい。]]></value>
+	</item>
 </lang>

modules/member/tpl/header.html

@@ -1,4 +1,3 @@
-<load target="js/config.js" />
 <div class="x_page-header">
 	<h1>{$lang->cmd_member_config} <a class="x_icon-question-sign" href="./admin/help/index.html#UMAN_member_config" target="_blank">{$lang->help}</a></h1>
 </div>
@@ -11,6 +10,9 @@ <h1>{$lang->cmd_member_config} <a class="x_icon-question-sign" href="./admin/hel
 	<li class="x_active"|cond="$act == 'dispMemberAdminLoginConfig'"><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminLoginConfig')}">{$lang->cmd_login}</a></li>
 	<li class="x_active"|cond="$act == 'dispMemberAdminDesignConfig'"><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminDesignConfig')}">{$lang->cmd_set_design_info}</a></li>
 </ul>
-<script>
-	enableSignUpTab({$config->enable_join == 'Y' ? 'true' : 'false'});
-</script>
+
+<block cond="$act === 'dispMemberAdminSignUpConfig' && $config->enable_join !== 'Y'">
+	<div class="x_msg-warn message error">
+		<p>{$lang->warn_member_setting}</p>
+	</div>
+</block>

modules/member/tpl/js/default_config.js

@@ -1,9 +1,4 @@
 jQuery(function($){
-	$('input[name=enable_join]').click(function(){
-		var checked = $('input[name=enable_join]:checked').val();
-		enableSignUpTab(checked == 'Y');
-	});
-
 	$('.__sync').click(function (){
 		exec_xml(
 			'importer', // module

modules/member/tpl/signup_config.html

@@ -98,7 +98,7 @@
 						<input type="hidden" name="usable_list[]" value="{$item->name}"/>
 						<input type="hidden" name="{$item->name}" value="requierd"/>
 						<th scope="row">
-							<span class="_title" style="display:inline-block;white-space:nowrap;overflow:hidden;width:120px;text-overflow:ellipsis;padding-left:20px">{$item->title} <a class="x_icon-question-sign" href="./admin/help/index.html#UMAN_login_key" target="_blank">{$lang->help}</a></span>
+							<span class="_title" style="display:inline-block;white-space:pre-line;overflow:inherit;width:120px;text-overflow:ellipsis;padding-left:20px">{$item->title} <a class="x_icon-question-sign" href="./admin/help/index.html#UMAN_login_key" target="_blank">{$lang->help}</a></span>
 						</th>
 						<td style="text-align:center"><input type="radio" name="identifier" value="{$item->name}" checked="checked" /></td>
 						<td style="text-align:center"><input type="checkbox" name="usable_list[]" value="{$item->name}" title="{$lang->use}" checked="checked"  disabled="disabled" /></td>
@@ -118,7 +118,7 @@
 						<th scope="row">
 							<div class="wrap">
 								<button type="button" class="dragBtn">Move to</button>
-								<span class="_title" style="display:inline-block;white-space:nowrap;overflow:hidden;width:120px;text-overflow:ellipsis" title="{$item->title}">{$item->title}</span>
+								<span class="_title" style="display:inline-block;white-space:pre-line;overflow:inherit;width:120px;text-overflow:ellipsis" title="{$item->title}">{$item->title}</span>
 							</div>
 						</th>
 						<td style="text-align:center"><input type="radio" name="identifier" value="{$item->name}" cond="$item->name== 'email_address' || $item->name=='user_id'" /></td>
@@ -157,7 +157,7 @@
 							<input type="hidden" name="{$item->name}_member_join_form_srl" value="{$item->member_join_form_srl}" />
 							<div class="wrap">
 								<button type="button" class="dragBtn">Move to</button>
-								<span class="_title" style="display:inline-block;white-space:nowrap;overflow:hidden;width:120px;text-overflow:ellipsis" title="{$item->title}">{$item->title}</span>
+								<span class="_title" style="display:inline-block;white-space:pre-line;overflow:inherit;width:120px;text-overflow:ellipsis" title="{$item->title}">{$item->title}</span>
 							</div>
 						</th>
 						<td></td>

modules/point/point.controller.php

@@ -211,10 +211,6 @@ function triggerDeleteDocument(&$obj)
 			// if the point is set to decrease when writing a document, make sure it does not increase the points when deleting an article
 			if($point < 0) return new BaseObject();
 			$cur_point -= $point;
-			// Add points related to deleting an attachment
-			$point = $module_config['upload_file'];
-			if(strlen($point) == 0 && !is_int($point)) $point = $config->upload_file;
-			if($obj->uploaded_count) $cur_point -= $point * $obj->uploaded_count;
 			// Increase the point
 			$this->setPoint($member_srl,$cur_point);
 		}

modules/widget/tpl/js/widget.js

@@ -1148,7 +1148,7 @@ function widgetDrag(tobj, dx, dy) {
 			for(var i=0;i<widgetList.length;i++) {
 				var target_obj = widgetList[i];
 				var widget = target_obj.getAttribute("widget");
-				if(widget == 'widgetBox' || target_obj.parentNode != zonePageObj) continue;
+				if(target_obj.parentNode != zonePageObj) continue;
 				var l =  xPageX(target_obj);
 				var t =  xPageY(target_obj);
 				var ll =  parseInt(l,10) + parseInt(xWidth(target_obj),10);