diff --git a/templates/jasset/asset_cu_list.html b/templates/jasset/asset_cu_list.html index 6fa61b79c..7ab1958ca 100644 --- a/templates/jasset/asset_cu_list.html +++ b/templates/jasset/asset_cu_list.html @@ -130,7 +130,7 @@ title: title, maxmin: true, shade: false, - area: ['725', '600px'], + area: ['725px', '600px'], content: new_url+data+'&check_assets='+check_assets }); //window.open(new_url + data, '', 'location=no, resizeable=no, height=410, width=625, top=89px, left=99px,toolbar=no,menubar=no,scrollbars=auto,status=no'); diff --git a/templates/juser/user_edit.html b/templates/juser/user_edit.html index 4fc083c07..526b081ee 100644 --- a/templates/juser/user_edit.html +++ b/templates/juser/user_edit.html @@ -23,7 +23,7 @@
-
+ {% if error %}
{{ error }}
{% endif %} diff --git a/templates/juser/user_list.html b/templates/juser/user_list.html index 803f5409f..ad8437a87 100644 --- a/templates/juser/user_list.html +++ b/templates/juser/user_list.html @@ -74,7 +74,7 @@ {% endif %} - 编辑 + 编辑 删除