diff --git a/module/company/view/browse.html.php b/module/company/view/browse.html.php index 674c6ced2b..7130df4637 100644 --- a/module/company/view/browse.html.php +++ b/module/company/view/browse.html.php @@ -81,8 +81,7 @@ js::set('confirmDelete', $lang->user->confirmDelete); common::printIcon('user', 'edit', "userID=$user->id&from=company", '', 'list'); if(strpos($this->app->company->admins, ",{$user->account},") === false and common::hasPriv('user', 'delete')) { - $deleteURL = $this->createLink('user', 'delete', "userID=$user->id&confirm=yes"); - echo html::a("javascript:ajaxDelete(\"$deleteURL\",\"userList\",confirmDelete)", '', '', "title='{$lang->user->delete}' class='btn-icon'"); + echo html::a($this->createLink('user', 'delete', "userID= $user->id"), '', '', "title='{$lang->user->delete}' class='btn-icon iframe'"); } if((strtotime(date('Y-m-d H:i:s')) - strtotime($user->locked)) < $this->config->user->lockMinutes * 60) { diff --git a/module/file/view/export.html.php b/module/file/view/export.html.php index 06bb55c57a..ab6fc8c39b 100644 --- a/module/file/view/export.html.php +++ b/module/file/view/export.html.php @@ -1,72 +1,72 @@ - - * @package file - * @version $Id$ - * @link http://www.zentao.net - */ -?> - - -
-
- icons['export']);?> - export;?> -
-
-
- - - - - - - - -
-
- setFileName;?> - -
-
- exportFileTypeList, '', 'onchange=switchEncode(this.value) class="form-control"');?> - - charsets[$this->cookie->lang], 'utf-8', key($lang->exportFileTypeList) == 'csv' ? "class='form-control'" : "class='form-control'");?> - - exportTypeList, ($this->cookie->checkedItem) ? 'selected' : 'all', "class='form-control'");?> - export);?>
-
- + * @author Congzhi Chen + * @package file + * @version $Id$ + * @link http://www.zentao.net + */ +?> + + +
+
+ icons['export']);?> + export;?> +
+
+
+ + + + + + + + +
+
+ setFileName;?> + +
+
+ exportFileTypeList, '', 'onchange=switchEncode(this.value) class="form-control"');?> + + charsets[$this->cookie->lang], 'utf-8', key($lang->exportFileTypeList) == 'csv' ? "class='form-control'" : "class='form-control'");?> + + exportTypeList, ($this->cookie->checkedItem) ? 'selected' : 'all', "class='form-control'");?> + export);?>
+
+ diff --git a/module/user/view/batchcreate.html.php b/module/user/view/batchcreate.html.php index a201151bcd..26433330b4 100644 --- a/module/user/view/batchcreate.html.php +++ b/module/user/view/batchcreate.html.php @@ -57,6 +57,10 @@ + + user->verifyPwd?> + user->placeholder->verify}'");?> + diff --git a/module/user/view/batchedit.html.php b/module/user/view/batchedit.html.php index 2ad833b434..f8f543c857 100644 --- a/module/user/view/batchedit.html.php +++ b/module/user/view/batchedit.html.php @@ -53,6 +53,10 @@ id]", $user->join, "class='form-control form-date'");?> + + user->verifyPwd?> + user->placeholder->verify}'");?> + diff --git a/module/user/view/delete.html.php b/module/user/view/delete.html.php new file mode 100644 index 0000000000..0038e07494 --- /dev/null +++ b/module/user/view/delete.html.php @@ -0,0 +1,32 @@ + + * @package user + * @version $Id$ + * @link http://www.zentao.net + */ +?> + +
+
+ user->delete;?> +
+
+
+ + + + + + +
+ user->verifyPwd;?> + + user->placeholder->verify}'");?> +
+
+