Changeset 13529
- Timestamp:
- 11/21/07 11:14:18 (1 year ago)
- Files:
-
- trunk/midcom/midcom.admin.user/handler/list.php (modified) (1 diff)
- trunk/midcom/midcom.admin.user/handler/user/edit.php (modified) (1 diff)
- trunk/midcom/midcom.admin.user/locale/default.en.txt (modified) (3 diffs)
- trunk/midcom/midcom.admin.user/locale/default.fi.txt (modified) (3 diffs)
- trunk/midcom/midcom.admin.user/static/jquery.midcom_admin_user.js (added)
- trunk/midcom/midcom.admin.user/static/jquery.tablesorter.widget.column_highlight.js (added)
- trunk/midcom/midcom.admin.user/static/usermgmt.css (modified) (2 diffs)
- trunk/midcom/midcom.admin.user/style/midcom-admin-user-person-edit.php (modified) (2 diffs)
- trunk/midcom/midcom.admin.user/style/midcom-admin-user-personlist-footer.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/midcom/midcom.admin.user/handler/list.php
r13514 r13529 44 44 ); 45 45 46 $_MIDCOM->add_jsfile(MIDCOM_STATIC_URL . '/jQuery/jquery.tablesorter.pack.js'); 46 $_MIDCOM->add_jsfile(MIDCOM_STATIC_URL . '/jQuery/jquery.tablesorter.js'); 47 $_MIDCOM->add_jsfile(MIDCOM_STATIC_URL . '/midcom.admin.user/jquery.tablesorter.widget.column_highlight.js'); 48 $_MIDCOM->add_jsfile(MIDCOM_STATIC_URL . '/midcom.admin.user/jquery.midcom_admin_user.js'); 47 49 48 50 midgard_admin_asgard_plugin::prepare_plugin($this->_l10n->get('midcom.admin.user'),$this->_request_data); trunk/midcom/midcom.admin.user/handler/user/edit.php
r13510 r13529 200 200 { 201 201 midgard_admin_asgard_plugin::asgard_header(); 202 202 203 $data['handler_id'] = $handler_id; 203 204 $data['l10n'] =& $this->_l10n; 204 205 $data['person'] =& $this->_person; trunk/midcom/midcom.admin.user/locale/default.en.txt
r13510 r13529 188 188 ---STRINGEND 189 189 190 ---STRING passwords will be sent to the following users 191 Passwords will be sent to the following users 192 ---STRINGEND 193 190 194 ---STRING person %s saved 191 195 User %s saved … … 220 224 ---STRINGEND 221 225 226 ---STRING select all 227 Select all 228 ---STRINGEND 229 222 230 ---STRING sender 223 231 Sender … … 268 276 ---STRINGEND 269 277 270 ---STRING passwords will be sent to the following users271 Passwords will be sent to the following users 272 ---STRINGEND 273 278 ---STRING invert selection 279 Invert selection 280 ---STRINGEND 281 trunk/midcom/midcom.admin.user/locale/default.fi.txt
r13510 r13529 188 188 ---STRINGEND 189 189 190 ---STRING passwords will be sent to the following users 191 Salasanat lÀhetetÀÀn seuraaville kÀyttÀjille 192 ---STRINGEND 193 190 194 ---STRING person %s saved 191 195 KÀyttÀjÀ %s tallennettu … … 220 224 ---STRINGEND 221 225 226 ---STRING select all 227 Valitse kaikki 228 ---STRINGEND 229 222 230 ---STRING sender 223 231 LÀhettÀjÀ … … 268 276 ---STRINGEND 269 277 270 ---STRING passwords will be sent to the following users271 Salasanat lÀhetetÀÀn seuraaville kÀyttÀjille 272 ---STRINGEND 273 278 ---STRING invert selection 279 KÀÀnnÀ valinnat pÀinvastaisiksi 280 ---STRINGEND 281 trunk/midcom/midcom.admin.user/static/usermgmt.css
r13514 r13529 24 24 25 25 table.midcom_admin_user_search_results thead th, 26 table.midcom_admin_user_search_results t body td26 table.midcom_admin_user_search_results td 27 27 { 28 28 padding-left: 4px; … … 65 65 float: right; 66 66 width: 25em; 67 -moz-border-radius: 6px; 68 padding: 1em; 69 background-color: #eeeeef; 70 margin-bottom: 1em; 67 71 } 68 72 69 73 #midcom_admin_user_passwords pre 70 74 { 71 background-color: # eeeeef;75 background-color: #ffffff; 72 76 padding: 6px; 73 77 } trunk/midcom/midcom.admin.user/style/midcom-admin-user-person-edit.php
r13506 r13529 3 3 ?> 4 4 <h1><?php echo $data['view_title']; ?></h1> 5 <?php 6 if ($data['handler_id'] === '____mfa-asgard_midcom.admin.user-user_edit_password') 7 { 8 ?> 5 9 <div id="midcom_admin_user_passwords"> 6 10 <a href="&(prefix);__mfa/asgard_midcom.admin.user/password/" target="_blank"><?php echo $data['l10n']->get('generate passwords'); ?></a> 7 11 </div> 8 <?php $data['controller']->display_form(); ?>9 12 <script type="text/javascript"> 10 13 // <![CDATA[ … … 18 21 // ]]> 19 22 </script> 23 24 <?php 25 } 26 27 $data['controller']->display_form(); 28 ?> trunk/midcom/midcom.admin.user/style/midcom-admin-user-personlist-footer.php
r13514 r13529 15 15 </tbody> 16 16 <tfoot> 17 <tr> 18 <td colspan="<?php echo count($data['list_fields']) + 1; ?>"> 19 <label for="select_all"> 20 <input type="checkbox" name="select_all" id="select_all" value="" onclick="$j(this).check_all('#midcom_admin_user_batch_process table tbody');" /> <?php echo $_MIDCOM->i18n->get_string('select all', 'midcom.admin.user');; ?> 21 </label> 22 <label for="invert_selection"> 23 <input type="checkbox" name="invert_selection" id="invert_selection" value="" onclick="$j(this).invert_selection('#midcom_admin_user_batch_process table tbody');" /> <?php echo $_MIDCOM->i18n->get_string('invert selection', 'midcom.admin.user');; ?> 24 </label> 25 </td> 26 </tr> 17 27 <tr> 18 28 <td> </td> … … 82 92 } 83 93 }); 84 $j('#midcom_admin_user_batch_process table').tablesorter({sortList: [[2,0]]}); 94 $j('#midcom_admin_user_batch_process table').tablesorter( 95 { 96 // widgets: ['column_highlight'], 97 sortList: [[2,0]] 98 }); 85 99 // ]]> 86 100 </script>
