stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-05-30 08:19:10 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into talmdal_dev

Browse Source 
Conflicts:
	modules/server_add/helpers/server_add_theme.php
This commit is contained in:
Tim Almdal
2009-10-24 07:28:22 -07:00
parent 18b402a1e5 e13f92abab
commit 0a6b540092
14 changed files with 157 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/user/controllers/admin_users.php
View File

@@ -317,7 +317,6 @@ class Admin_Users_Controller extends Admin_Controller {
static function _get_user_add_form_admin() {
$form = new Forge("admin/users/add_user", "", "post", array("id" => "g-add-user-form"));
$form->set_attr('class', "g-narrow");
$group = $form->group("add_user")->label(t("Add User"));
$group->input("name")->label(t("Username"))->id("g-username")
->error_messages("in_use", t("There is already a user with that username"));
@@ -375,7 +374,7 @@ class Admin_Users_Controller extends Admin_Controller {
private function _get_group_add_form_admin() {
$form = new Forge("admin/users/add_group", "", "post", array("id" => "g-add-group-form"));
$form->set_attr('class', "g-narrow");
$form->set_attr('class', "g-one-quarter");
$form_group = $form->group("add_group")->label(t("Add Group"));
$form_group->input("name")->label(t("Name"))->id("g-name");
$form_group->inputs["name"]->error_messages(