| Index: trunk/extensions/SocialProfile/UserStatus/UserStatus.i18n.php |
| — | — | @@ -17,6 +17,8 @@ |
| 18 | 18 | 'userstatus-cancel' => 'Cancel', |
| 19 | 19 | 'userstatus-history' => 'History', |
| 20 | 20 | 'userstatus-letters-left' => 'letters left', |
| | 21 | + 'userstatus-blocked' => 'You are blocked', |
| | 22 | + 'userstatus-readonly' => 'The database is locked', |
| 21 | 23 | ); |
| 22 | 24 | |
| 23 | 25 | /** Message documentation (Message documentation) |
| — | — | @@ -169,6 +171,7 @@ |
| 170 | 172 | 'userstatus-edit' => 'Редагувати', |
| 171 | 173 | 'userstatus-save' => 'Зберегти', |
| 172 | 174 | 'userstatus-cancel' => 'Відмінити', |
| 173 | | - 'userstatus-history' => 'символів залишилось', |
| | 175 | + 'userstatus-history' => 'Історія', |
| | 176 | + 'userstatus-letters-left' => 'символів залишилось', |
| 174 | 177 | ); |
| 175 | 178 | |
| Index: trunk/extensions/SocialProfile/UserStatus/UserStatus.css |
| — | — | @@ -1,12 +1,10 @@ |
| 2 | | -#status-box |
| 3 | | -{ |
| | 2 | +#status-box { |
| 4 | 3 | width : 400px; |
| 5 | 4 | padding: 0px; |
| 6 | 5 | margin: 0px; |
| 7 | 6 | } |
| 8 | 7 | |
| 9 | | -#status-box-top |
| 10 | | -{ |
| | 8 | +#status-box-top { |
| 11 | 9 | overflow:visible; |
| 12 | 10 | margin-left: 34px; |
| 13 | 11 | width: 30px; |
| — | — | @@ -15,53 +13,45 @@ |
| 16 | 14 | background-image: url('../images/status-corner.png'); |
| 17 | 15 | } |
| 18 | 16 | |
| 19 | | -#status-box-content |
| 20 | | -{ |
| | 17 | +#status-box-content { |
| 21 | 18 | background-color:orange; |
| 22 | 19 | padding:10px; |
| 23 | 20 | border-radius: 22px; |
| 24 | 21 | /*height: 38px;*/ |
| 25 | 22 | } |
| 26 | 23 | |
| 27 | | -#user-status-block |
| 28 | | -{ |
| | 24 | +#user-status-block { |
| 29 | 25 | text-align: center; |
| 30 | 26 | color: white; |
| 31 | 27 | } |
| 32 | 28 | |
| 33 | | -#us-link |
| 34 | | -{ |
| | 29 | +#us-link { |
| 35 | 30 | color: white; |
| 36 | 31 | font-size: 8pt; |
| 37 | 32 | text-decoration: underline; |
| 38 | 33 | } |
| 39 | 34 | |
| 40 | | -#user-status-history |
| 41 | | -{ |
| | 35 | +#user-status-history { |
| 42 | 36 | background-color: orange; |
| 43 | 37 | color: white; |
| 44 | 38 | } |
| 45 | 39 | |
| 46 | | -#user-status-history a |
| 47 | | -{ |
| | 40 | +#user-status-history a { |
| 48 | 41 | text-decoration: underline; |
| 49 | 42 | color: white; |
| 50 | 43 | } |
| 51 | 44 | |
| 52 | | -#status-history-time |
| 53 | | -{ |
| | 45 | +#status-history-time { |
| 54 | 46 | font-size: 9px; |
| 55 | 47 | } |
| 56 | 48 | |
| 57 | | -#status-letter-count |
| 58 | | -{ |
| | 49 | +#status-letter-count { |
| 59 | 50 | float:right; |
| 60 | 51 | margin-right: 20px; |
| 61 | 52 | font-size: 8pt; |
| 62 | 53 | } |
| 63 | 54 | |
| 64 | | -#status-bar |
| 65 | | -{ |
| | 55 | +#status-bar { |
| 66 | 56 | margin-left: 20px; |
| 67 | 57 | text-align: left; |
| 68 | 58 | } |
| \ No newline at end of file |
| Index: trunk/extensions/SocialProfile/UserStatus/UserStatus.js |
| — | — | @@ -4,7 +4,7 @@ |
| 5 | 5 | |
| 6 | 6 | toShowMode: function( status, id ) { |
| 7 | 7 | document.getElementById( 'user-status-block' ).innerHTML = status; |
| 8 | | - document.getElementById( 'user-status-block' ).innerHTML += '<br> <a id="us-link" href="javascript:UserStatus.toEditMode(\'' + status + '\',' + id + ');">Edit</a>'; |
| | 8 | + document.getElementById( 'user-status-block' ).innerHTML += '<br> <a id="us-link" href="javascript:UserStatus.toEditMode(\'' + status + '\',' + id + ');">'+_US_EDIT+'</a>'; |
| 9 | 9 | }, |
| 10 | 10 | |
| 11 | 11 | usLettersLeft: function() { |
| Index: trunk/extensions/SocialProfile/UserProfile/UserProfilePage.php |
| — | — | @@ -1797,22 +1797,18 @@ |
| 1798 | 1798 | // Only owners of the page can change statuses |
| 1799 | 1799 | if ( $wgUser->getId() == $userId ) { |
| 1800 | 1800 | if ( $wgUser->isBlocked() ) { |
| 1801 | | - $us = 'You are blocked'; |
| 1802 | | - return false; |
| | 1801 | + return wfMsg('userstatus-blocked'); |
| 1803 | 1802 | } |
| 1804 | 1803 | |
| 1805 | 1804 | // Database operations require write mode |
| 1806 | 1805 | if ( wfReadOnly() ) { |
| 1807 | | - $us = 'Database is in ReadOnly mode'; |
| 1808 | | - return; |
| | 1806 | + return wfMsg('userstatus-readonly'); |
| 1809 | 1807 | } |
| 1810 | 1808 | |
| 1811 | | - $us = "<script>UserStatus.toShowMode('$buf','$userId');</script>"; |
| | 1809 | + return "<script>UserStatus.toShowMode('$buf','$userId');</script>"; |
| 1812 | 1810 | } else { |
| 1813 | | - $us = $buf; |
| | 1811 | + return $buf; |
| 1814 | 1812 | } |
| 1815 | | - |
| 1816 | | - return $us; |
| 1817 | 1813 | } |
| 1818 | 1814 | |
| 1819 | 1815 | } |