Merge branch 'develop' into pr/cache-refactor

Conflicts:
	modules/ncenterlite/ncenterlite.controller.php
This commit is contained in:
Kijin Sung 2016-04-23 11:25:32 +09:00
commit 3b8db58954
30 changed files with 192 additions and 144 deletions

View file

@ -56,7 +56,7 @@
<input type="text" name="orgpoint" value="{$val->point}" disabled="disabled" style="width:40px;text-align:right" />
-&gt;
<span class="x_input-append">
<input type="number" id="point_{$val->member_srl}" value="{$val->point}" name="point" required style="width:60px;text-align:right" />
<input type="text" id="point_{$val->member_srl}" value="{$val->point}" name="point" required style="width:60px;text-align:right" />
<input type="button" value="{$lang->cmd_update}" onclick="updatePoint({$val->member_srl})" class="x_btn" />
</span>
</form>