Changeset 12715
- Timestamp:
- 10/09/07 15:21:49 (1 year ago)
- Files:
-
- trunk/midcom/midcom.admin.user/config/schemadb_group.inc (modified) (3 diffs)
- trunk/midcom/midcom.admin.user/config/schemadb_person.inc (modified) (2 diffs)
- trunk/midcom/midcom.admin.user/handler/group/edit.php (modified) (1 diff)
- trunk/midcom/midcom.admin.user/handler/list.php (modified) (2 diffs)
- trunk/midcom/midcom.admin.user/handler/user/edit.php (modified) (1 diff)
- trunk/midcom/midcom.admin.user/locale (added)
- trunk/midcom/midcom.admin.user/locale/default.en.txt (added)
- trunk/midcom/midcom.admin.user/locale/default.fi.txt (added)
- trunk/midcom/midcom.admin.user/style/midcom-admin-user-personlist-header.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/midcom/midcom.admin.user/config/schemadb_group.inc
r12711 r12715 3 3 ( 4 4 'description' => 'group', 5 'l10n_db' => 'midcom.admin.user', 5 6 'fields' => array 6 7 ( … … 49 50 'validation' => 'email', 50 51 ), 51 'street' => array52 (53 'title' => 'street address',54 'type' => 'text',55 'widget' => 'text',56 'storage' => 'street',57 ),58 52 'postcode' => array 59 53 ( 60 'title' => 'post alcode',54 'title' => 'postcode', 61 55 'type' => 'text', 62 56 'widget' => 'text', … … 72 66 'persons' => array 73 67 ( 74 'title' => ' persons',68 'title' => 'members', 75 69 'storage' => null, 76 70 'type' => 'mnrelation', trunk/midcom/midcom.admin.user/config/schemadb_person.inc
r12707 r12715 3 3 ( 4 4 'description' => 'person', 5 'l10n_db' => 'midcom.admin.user', 5 6 'fields' => array 6 7 ( … … 40 41 'workphone' => array 41 42 ( 42 'title' => 'work phone',43 'title' => 'workphone', 43 44 'type' => 'text', 44 45 'widget' => 'text', 45 46 'storage' => 'workphone' 46 47 ), 47 ' workphone' => array48 'postcode' => array 48 49 ( 49 'title' => ' work phone',50 'title' => 'postcode', 50 51 'type' => 'text', 51 52 'widget' => 'text', 52 'storage' => 'workphone' 53 'storage' => 'postcode', 54 ), 55 'city' => array 56 ( 57 'title' => 'city', 58 'type' => 'text', 59 'widget' => 'text', 60 'storage' => 'city', 53 61 ), 54 62 'groups' => array trunk/midcom/midcom.admin.user/handler/group/edit.php
r12714 r12715 46 46 ( 47 47 MIDCOM_NAV_URL => "__mfa/asgard_midcom.admin.user/", 48 MIDCOM_NAV_NAME => $_MIDCOM->i18n->get_string(' user management', 'midcom.admin.user'),48 MIDCOM_NAV_NAME => $_MIDCOM->i18n->get_string('midcom.admin.user', 'midcom.admin.user'), 49 49 ); 50 50 $tmp = array_reverse($tmp); trunk/midcom/midcom.admin.user/handler/list.php
r12713 r12715 35 35 ( 36 36 MIDCOM_NAV_URL => "__mfa/asgard_midcom.admin.user/", 37 MIDCOM_NAV_NAME => $ _MIDCOM->i18n->get_string('user management', 'midcom.admin.user'),37 MIDCOM_NAV_NAME => $this->_request_data['view_title'], 38 38 ); 39 39 $_MIDCOM->set_custom_context_data('midcom.helper.nav.breadcrumb', $tmp); … … 51 51 function _handler_list($handler_id, $args, &$data) 52 52 { 53 $data['view_title'] = $_MIDCOM->i18n->get_string(' user management', 'midcom.admin.user');53 $data['view_title'] = $_MIDCOM->i18n->get_string('midcom.admin.user', 'midcom.admin.user'); 54 54 $_MIDCOM->set_pagetitle($data['view_title']); 55 55 trunk/midcom/midcom.admin.user/handler/user/edit.php
r12714 r12715 35 35 ( 36 36 MIDCOM_NAV_URL => "__mfa/asgard_midcom.admin.user/", 37 MIDCOM_NAV_NAME => $_MIDCOM->i18n->get_string(' user management', 'midcom.admin.user'),37 MIDCOM_NAV_NAME => $_MIDCOM->i18n->get_string('midcom.admin.user', 'midcom.admin.user'), 38 38 ); 39 39 $tmp[] = Array trunk/midcom/midcom.admin.user/style/midcom-admin-user-personlist-header.php
r12713 r12715 1 1 <form method="get" class="midcom_admin_user_search"> 2 2 <label> 3 <span><?php echo $_MIDCOM->i18n->get_string('search ', 'midcom.admin.user'); ?></span>3 <span><?php echo $_MIDCOM->i18n->get_string('search person', 'midcom.admin.user'); ?></span> 4 4 <input type="text" name="midcom_admin_user_search" value="<?php if (isset($_REQUEST['midcom_admin_user_search'])) { echo $_REQUEST['midcom_admin_user_search']; } ?>" /> 5 5 </label> 6 6 <input type="submit" value="<?php echo $_MIDCOM->i18n->get_string('go', 'midcom.admin.user'); ?>" /> 7 7 <div class="helptext"> 8 <?php 9 echo sprintf($_MIDCOM->i18n->get_string('the following fields will be searched: %s', 'midcom.admin.user'), implode(', ', $data['search_fields'])); 8 <?php 9 $data['search_fields_l10n'] = array(); 10 foreach ($data['search_fields'] as $field) 11 { 12 $data['search_fields_l10n'][] = $_MIDCOM->i18n->get_string($field, 'midcom.admin.user'); 13 } 14 echo sprintf($_MIDCOM->i18n->get_string('the following fields will be searched: %s', 'midcom.admin.user'), implode(', ', $data['search_fields_l10n'])); 10 15 ?> 11 16 </div>
