| Index: trunk/extensions/DataCenter/DataCenter.ui.php |
| — | — | @@ -976,7 +976,7 @@ |
| 977 | 977 | return self::message( 'category', $value ); |
| 978 | 978 | break; |
| 979 | 979 | case 'side': |
| 980 | | - return self::message( 'option', $value ? 'front' : 'back' ); |
| | 980 | + return self::message( 'option', $value ? 'back' : 'front' ); |
| 981 | 981 | break; |
| 982 | 982 | case 'angle': |
| 983 | 983 | return self::message( 'label', 'degrees-value', $value * 90 ); |
| Index: trunk/extensions/DataCenter/Views/Plans/Plan.php |
| — | — | @@ -44,8 +44,10 @@ |
| 45 | 45 | $model = $asset->getModel(); |
| 46 | 46 | $tables['rack'][$key]->set( |
| 47 | 47 | array( |
| 48 | | - 'model' => $model->get( 'name' ), |
| 49 | | - 'manufacturer' => $model->get( 'manufacturer' ) |
| | 48 | + 'model' => implode( |
| | 49 | + ' / ', |
| | 50 | + $model->get( array( 'manufacturer', 'name' ) ) |
| | 51 | + ), |
| 50 | 52 | ) |
| 51 | 53 | ); |
| 52 | 54 | } |
| — | — | @@ -81,8 +83,11 @@ |
| 82 | 84 | 'rows' => $tables['rack'], |
| 83 | 85 | 'fields' => array( |
| 84 | 86 | 'name', |
| 85 | | - 'manufacturer', |
| 86 | 87 | 'model', |
| | 88 | + 'position' => array( |
| | 89 | + 'fields' => array( 'x', 'y' ), |
| | 90 | + 'glue' => ' x ', |
| | 91 | + ), |
| 87 | 92 | ), |
| 88 | 93 | 'link' => array( |
| 89 | 94 | 'page' => 'plans', |
| Index: trunk/extensions/DataCenter/Views/Plans/Rack.php |
| — | — | @@ -45,9 +45,19 @@ |
| 46 | 46 | $objectLinks[$key]->set( |
| 47 | 47 | array( |
| 48 | 48 | 'rack' => $object->getId(), |
| 49 | | - 'model' => $objectModel->get( 'name' ), |
| 50 | | - 'manufacturer' => $objectModel->get( 'manufacturer' ), |
| 51 | | - 'position' => $objectLink->get( 'z' ), |
| | 49 | + 'model' => implode( |
| | 50 | + ' / ', |
| | 51 | + $objectModel->get( array( 'manufacturer', 'name' ) ) |
| | 52 | + ), |
| | 53 | + 'position' => implode( |
| | 54 | + ': ', |
| | 55 | + array( |
| | 56 | + DataCenterUI::format( |
| | 57 | + $objectLink->get( 'orientation' ), 'side' |
| | 58 | + ), |
| | 59 | + $objectLink->get( 'z' ), |
| | 60 | + ) |
| | 61 | + ), |
| 52 | 62 | ) |
| 53 | 63 | ); |
| 54 | 64 | } |
| — | — | @@ -87,7 +97,7 @@ |
| 88 | 98 | array( |
| 89 | 99 | 'rows' => $objectLinks, |
| 90 | 100 | 'fields' => array( |
| 91 | | - 'name', 'manufacturer', 'model', |
| | 101 | + 'name', 'model', 'position', |
| 92 | 102 | ), |
| 93 | 103 | 'link' => array( |
| 94 | 104 | 'page' => 'plans', |