| Index: trunk/extensions/EducationProgram/EducationProgram.settings.php |
| — | — | @@ -38,7 +38,10 @@ |
| 39 | 39 | 'wikimedia.org' |
| 40 | 40 | ), |
| 41 | 41 | 'ambassadorCommonsUrl' => 'https://commons.wikimedia.org/wiki/Special:UploadWizard', |
| 42 | | - 'citylessCountries' => array( 'BT', 'BV', 'IO', 'VG', 'TD', 'CX', 'CC', 'KM', 'DJ', 'GQ', 'FK', 'FX', 'TF', 'GW', 'HM', 'KI', 'YT', 'MS', 'NR', 'NU', 'NF', 'PN', 'SH', 'PM', 'WS', 'SC', 'GS', 'SJ', 'TK', 'TP', 'TV', 'UM', 'VU', 'EH' ), |
| | 42 | + 'citylessCountries' => array( |
| | 43 | + 'BT', 'BV', 'IO', 'VG', 'TD', 'CX', 'CC', 'KM', 'DJ', 'GQ', 'FK', 'FX', 'TF', 'GW', 'HM', 'KI', 'YT', |
| | 44 | + 'MS', 'NR', 'NU', 'NF', 'PN', 'SH', 'PM', 'WS', 'SC', 'GS', 'SJ', 'TK', 'TP', 'TV', 'UM', 'VU', 'EH' |
| | 45 | + ), |
| 43 | 46 | 'ambassadorImgWidth' => 140, |
| 44 | 47 | 'ambassadorImgHeight' => 140, |
| 45 | 48 | 'recentActivityLimit' => 24 * 60 * 60, |
| Index: trunk/extensions/EducationProgram/specials/SpecialEnroll.php |
| — | — | @@ -146,12 +146,13 @@ |
| 147 | 147 | 'action' => $this->getTitle( $this->subPage )->getLocalURL(), |
| 148 | 148 | ) |
| 149 | 149 | ) ); |
| | 150 | + $lang = $this->getLanguage(); |
| 150 | 151 | |
| 151 | 152 | $out->addHTML( '<fieldset>' ); |
| 152 | 153 | |
| 153 | 154 | $out->addHTML( '<legend>' . wfMsgHtml( 'ep-enroll-add-token' ) . '</legend>' ); |
| 154 | 155 | |
| 155 | | - $out->addElement( 'p', array(), wfMsg( 'ep-enroll-add-token-doc' ) ); |
| | 156 | + $out->addHTML( Html::element( 'p', array(), wfMsg( 'ep-enroll-add-token-doc' ) ) ); |
| 156 | 157 | |
| 157 | 158 | $out->addHTML( ' ' . Xml::inputLabel( wfMsg( 'ep-enroll-token' ), 'wptoken', 'wptoken' ) ); |
| 158 | 159 | |
| Index: trunk/extensions/EducationProgram/specials/SpecialEducationProgram.php |
| — | — | @@ -133,15 +133,20 @@ |
| 134 | 134 | public function displayByTerm() { |
| 135 | 135 | $termsData = $this->getTermData(); |
| 136 | 136 | |
| 137 | | - $html = Html::element( 'h2', array(), $this->msgTxt( 'by-term' ) ); |
| | 137 | + if ( empty( $termsData['terms'] ) ) { |
| | 138 | + $html = $this->msgTxt( 'nodata' ); |
| | 139 | + } |
| | 140 | + else { |
| | 141 | + $html = Html::element( 'h2', array(), $this->msgTxt( 'by-term' ) ); |
| 138 | 142 | |
| 139 | | - $html .= $this->getByTermTable( $termsData['terms'] ); |
| | 143 | + $html .= $this->getByTermTable( $termsData['terms'] ); |
| 140 | 144 | |
| 141 | | - $html .= Html::element( 'h2', array(), $this->msgTxt( 'genders' ) ); |
| | 145 | + $html .= Html::element( 'h2', array(), $this->msgTxt( 'genders' ) ); |
| 142 | 146 | |
| 143 | | - $html .= $this->getByGenderTable( $termsData['bygender'] ); |
| | 147 | + $html .= $this->getByGenderTable( $termsData['bygender'] ); |
| | 148 | + } |
| 144 | 149 | |
| 145 | | - return $html; |
| | 150 | + return $html; |
| 146 | 151 | } |
| 147 | 152 | |
| 148 | 153 | protected function getByGenderTable( $terms ) { |
| Index: trunk/extensions/EducationProgram/EducationProgram.i18n.php |
| — | — | @@ -239,6 +239,7 @@ |
| 240 | 240 | 'ep-educationprogram-female' => 'Female', |
| 241 | 241 | 'ep-educationprogram-unknown' => 'Unknown', |
| 242 | 242 | 'ep-educationprogram-genders' => 'Gender breakdown', |
| | 243 | + 'ep-educationprogram-nodata' => 'There is no data to display yet!', |
| 243 | 244 | |
| 244 | 245 | // Special:Institutions |
| 245 | 246 | 'ep-institutions-noresults' => 'There are no institutions to list.', |
| Index: trunk/extensions/EducationProgram/resources/images/student-o-meter_morethan-60.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: trunk/extensions/EducationProgram/resources/images/student-o-meter_morethan-60.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 246 | 247 | + application/octet-stream |
| Index: trunk/extensions/EducationProgram/resources/images/student-o-meter_morethan-0.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: trunk/extensions/EducationProgram/resources/images/student-o-meter_morethan-0.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 247 | 248 | + application/octet-stream |
| Index: trunk/extensions/EducationProgram/resources/images/student-o-meter_morethan-10.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: trunk/extensions/EducationProgram/resources/images/student-o-meter_morethan-10.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 248 | 249 | + application/octet-stream |
| Index: trunk/extensions/EducationProgram/resources/images/student-o-meter_morethan-20.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: trunk/extensions/EducationProgram/resources/images/student-o-meter_morethan-20.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 249 | 250 | + application/octet-stream |
| Index: trunk/extensions/EducationProgram/resources/images/student-o-meter_morethan-30.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: trunk/extensions/EducationProgram/resources/images/student-o-meter_morethan-30.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 250 | 251 | + application/octet-stream |
| Index: trunk/extensions/EducationProgram/resources/images/student-o-meter_morethan-40.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: trunk/extensions/EducationProgram/resources/images/student-o-meter_morethan-40.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 251 | 252 | + application/octet-stream |
| Index: trunk/extensions/EducationProgram/resources/images/student-o-meter_morethan-5.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: trunk/extensions/EducationProgram/resources/images/student-o-meter_morethan-5.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 252 | 253 | + application/octet-stream |
| Index: trunk/extensions/EducationProgram/resources/images/student-o-meter_morethan-50.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| Property changes on: trunk/extensions/EducationProgram/resources/images/student-o-meter_morethan-50.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 253 | 254 | + application/octet-stream |