| Index: trunk/extensions/Configure/Configure.page.php |
| — | — | @@ -1026,8 +1026,14 @@ |
| 1027 | 1027 | $id = 'wp'.$conf.'-key-'.$action.'-'.$type; |
| 1028 | 1028 | $left_col = Xml::tags( 'td', null, wfMsgExt( "configure-throttle-group-$type", 'parseinline' ) ); |
| 1029 | 1029 | |
| 1030 | | - $right_col = Xml::inputLabel( wfMsg( 'configure-throttle-count' ), "$id-count", "$id-count", 15, $count ) . ' <br /> ' . |
| 1031 | | - Xml::inputLabel( wfMsg( 'configure-throttle-period' ), "$id-period", "$id-period", 15, $period ); |
| | 1030 | + if ($allowed) { |
| | 1031 | + $right_col = Xml::inputLabel( wfMsg( 'configure-throttle-count' ), "$id-count", "$id-count", 15, $count ) . ' <br /> ' . |
| | 1032 | + Xml::inputLabel( wfMsg( 'configure-throttle-period' ), "$id-period", "$id-period", 15, $period ); |
| | 1033 | + } else { |
| | 1034 | + $right_col = ($count && $period) ? wfMsg( 'configure-throttle-summary', $count, $period ) : wfMsg( 'configure-throttle-none' ); |
| | 1035 | + ## Laziness: Make summaries work by putting the data in hidden fields, rather than a special case in JS. |
| | 1036 | + $right_col .= "\n" . Xml::hidden( "$id-count", $count, array( 'id' => "$id-count" ) ) . Xml::hidden( "$id-period", $period, array( 'id' => "$id-period" ) ); |
| | 1037 | + } |
| 1032 | 1038 | $right_col = Xml::tags( 'td', null, $right_col ); |
| 1033 | 1039 | |
| 1034 | 1040 | $innerRows .= Xml::tags( 'tr', array( 'id' => $id), $left_col . $right_col ) . "\n"; |
| Index: trunk/extensions/Configure/SpecialViewConfig.php |
| — | — | @@ -195,8 +195,6 @@ |
| 196 | 196 | $actions = array(); |
| 197 | 197 | if ( $hasSelf ) |
| 198 | 198 | $view = $skin->makeKnownLinkObj( $self, wfMsgHtml( 'configure-view' ), "version=$ts" ); |
| 199 | | - else |
| 200 | | - $view = wfMsgHtml( 'configure-view' ); |
| 201 | 199 | |
| 202 | 200 | if ( $allowedAll ) { |
| 203 | 201 | $viewWikis = array(); |
| — | — | @@ -211,7 +209,7 @@ |
| 212 | 210 | if ( $hasSelf ) |
| 213 | 211 | $editCore = $editMsg . $skin->makeKnownLinkObj( $configTitle, wfMsgHtml( 'configure-edit-core' ), "version=$ts" ); |
| 214 | 212 | else |
| 215 | | - $editCore = $editMsg . wfMsgHtml( 'configure-edit-core' ); |
| | 213 | + $editCore = $editMsg; |
| 216 | 214 | |
| 217 | 215 | if ( $allowedConfigAll ) { |
| 218 | 216 | $viewWikis = array(); |
| — | — | @@ -228,8 +226,6 @@ |
| 229 | 227 | $editExt .= $editMsg; |
| 230 | 228 | if ( $hasSelf ) |
| 231 | 229 | $editExt .= $skin->makeKnownLinkObj( $extTitle, wfMsgHtml( 'configure-edit-ext' ), "version=$ts" ); |
| 232 | | - else |
| 233 | | - $editExt .= wfMsgHtml( 'configure-edit-ext' ); |
| 234 | 230 | |
| 235 | 231 | if ( $allowedExtensionsAll ) { |
| 236 | 232 | $viewWikis = array(); |
| Index: trunk/extensions/Configure/Configure.i18n.php |
| — | — | @@ -174,6 +174,7 @@ |
| 175 | 175 | 'configure-throttle-summary' => '$1 actions in $2 seconds.', |
| 176 | 176 | 'configure-throttle-group' => 'Type', |
| 177 | 177 | 'configure-throttle-limit' => 'Limit', |
| | 178 | + 'configure-throttle-none' => 'No limit', |
| 178 | 179 | ); |
| 179 | 180 | |
| 180 | 181 | /** Message documentation (Message documentation) |