r98582 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r98581‎ | r98582 | r98583 >
Date:23:29, 30 September 2011
Author:awjrichards
Status:ok
Tags:
Comment:
ResourceLoader-ifying RapidHtml webitects forms
Modified paths:
  • /trunk/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/html/webitects_1.html (modified) (history)
  • /trunk/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/html/webitects_1a.html (modified) (history)
  • /trunk/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/html/webitects_2.html (modified) (history)
  • /trunk/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/html/webitects_2_3step.html (modified) (history)
  • /trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.php (modified) (history)

Diff [purge]

Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/html/webitects_2_3step.html
@@ -1,8 +1,8 @@
2 -<!-- load styles from original first steps -->
3 -<link rel="stylesheet" href="@script_path/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/css/lp1.css" />
 2+<script type="text/javascript">
 3+mw.loader.load('pfp.form.rapidhtml.webitects');
 4+</script>
45 <!--[if lt IE 7]><style type="text/css">body{behavior:url("@script_path/skins/vector/csshover.min.htc")}</style><![endif]-->
56 <!-- start Webitects styles -->
6 -<link rel="stylesheet" href="@script_path/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/css/Webitects.css" />
77 <style type="text/css">
88 #errorMessages { font-size: 0.75em; color: #FF0000; }
99 /* Force vertical scrollbar
@@ -229,11 +229,6 @@
230230 </div>
231231
232232 <!-- load jquery (newer) -->
233 - <script type='text/javascript' src='@script_path/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/js/jquery.js'></script>
234 - <script type='text/javascript' src='@script_path/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/js/jquery.ui.core.js'></script>
235 - <script type='text/javascript' src='@script_path/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/js/jquery.ui.widget.js'></script>
236 - <script type='text/javascript' src='@script_path/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/js/jquery.ui.accordion.js'></script>
237 - <script type='text/javascript' src='@script_path/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/js/jquery.ezpz_hint.js'></script>
238233 <script type="text/javascript">
239234 ( function( $ ){
240235 window.onload = function (){
@@ -481,4 +476,4 @@
482477 </script>
483478 <!-- Wikimedia Project logo
484479 <li id="footer-copyrightico"><a href="https://www.mediawiki.org//wikimediafoundation.org/"><img src="//bits.wikimedia.org/images/wikimedia-button.png" width="88" height="31" alt="Wikimedia Foundation"/></a></li>
485 - -->
\ No newline at end of file
 480+ -->
Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/html/webitects_1.html
@@ -1,8 +1,7 @@
2 -<!-- load styles from original first steps -->
3 -<link rel="stylesheet" href="@script_path/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/css/lp1.css" />
 2+<script type="text/javascript">
 3+mw.loader.load('pfp.form.rapidhtml.webitects');
 4+</script>
45 <!--[if lt IE 7]><style type="text/css">body{behavior:url("@script_path/skins/vector/csshover.min.htc")}</style><![endif]-->
5 -<!-- start Webitects styles -->
6 -<link rel="stylesheet" href="@script_path/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/css/Webitects.css" />
76 <style type="text/css">
87 #errorMessages { font-size: 0.75em; color: #FF0000; }
98 /* Force vertical scrollbar
@@ -206,11 +205,6 @@
207206 </div>
208207 </div>
209208 <!-- load jquery (newer) -->
210 - <script type='text/javascript' src='@script_path/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/js/jquery.js'></script>
211 - <script type='text/javascript' src='@script_path/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/js/jquery.ui.core.js'></script>
212 - <script type='text/javascript' src='@script_path/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/js/jquery.ui.widget.js'></script>
213 - <script type='text/javascript' src='@script_path/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/js/jquery.ui.accordion.js'></script>
214 - <script type='text/javascript' src='@script_path/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/js/jquery.ezpz_hint.js'></script>
215209 <script type="text/javascript">
216210 ( function( $ ){
217211 window.onload = function (){
Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/html/webitects_1a.html
@@ -1,8 +1,7 @@
2 -<!-- load styles from original first steps -->
3 -<link rel="stylesheet" href="@script_path/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/css/lp1.css" />
 2+<script type="text/javascript">
 3+mw.loader.load('pfp.form.rapidhtml.webitects');
 4+</script>
45 <!--[if lt IE 7]><style type="text/css">body{behavior:url("@script_path/skins/vector/csshover.min.htc")}</style><![endif]-->
5 -<!-- start Webitects styles -->
6 -<link rel="stylesheet" href="@script_path/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/css/Webitects.css" />
76 <style type="text/css">
87 #errorMessages { font-size: 0.75em; color: #FF0000; }
98 /* Force vertical scrollbar
@@ -207,11 +206,6 @@
208207 </div>
209208 </div>
210209 <!-- load jquery (newer) -->
211 - <script type='text/javascript' src='@script_path/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/js/jquery.js'></script>
212 - <script type='text/javascript' src='@script_path/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/js/jquery.ui.core.js'></script>
213 - <script type='text/javascript' src='@script_path/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/js/jquery.ui.widget.js'></script>
214 - <script type='text/javascript' src='@script_path/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/js/jquery.ui.accordion.js'></script>
215 - <script type='text/javascript' src='@script_path/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/js/jquery.ezpz_hint.js'></script>
216210 <script type="text/javascript">
217211 ( function( $ ){
218212 window.onload = function (){
Index: trunk/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/html/webitects_2.html
@@ -1,8 +1,7 @@
2 -<!-- load styles from original first steps -->
3 -<link rel="stylesheet" href="@script_path/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/css/lp1.css" />
 2+<script type="text/javascript">
 3+mw.loader.load('pfp.form.rapidhtml.webitects');
 4+</script>
45 <!--[if lt IE 7]><style type="text/css">body{behavior:url("@script_path/skins/vector/csshover.min.htc")}</style><![endif]-->
5 -<!-- start Webitects styles -->
6 -<link rel="stylesheet" href="@script_path/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/css/Webitects.css" />
76 <style type="text/css">
87 #errorMessages { font-size: 0.75em; color: #FF0000; }
98 /* Force vertical scrollbar
@@ -217,11 +216,6 @@
218217 </div>
219218
220219 <!-- load jquery (newer) -->
221 - <script type='text/javascript' src='@script_path/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/js/jquery.js'></script>
222 - <script type='text/javascript' src='@script_path/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/js/jquery.ui.core.js'></script>
223 - <script type='text/javascript' src='@script_path/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/js/jquery.ui.widget.js'></script>
224 - <script type='text/javascript' src='@script_path/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/js/jquery.ui.accordion.js'></script>
225 - <script type='text/javascript' src='@script_path/extensions/DonationInterface/payflowpro_gateway/forms/rapidhtml/js/jquery.ezpz_hint.js'></script>
226220 <script type="text/javascript">
227221 ( function( $ ){
228222 window.onload = function (){
Index: trunk/extensions/DonationInterface/payflowpro_gateway/payflowpro_gateway.php
@@ -167,6 +167,22 @@
168168 $wgAPIModules[ 'pfp' ] = 'ApiPayflowProGateway';
169169 $wgAutoloadClasses[ 'ApiPayflowProGateway' ] = $dir . 'api_payflowpro_gateway.php';
170170
 171+// Resources for ResourceLoader
 172+$wgResourceModules[ 'pfp.form.rapidhtml.webitects' ] = array(
 173+ 'styles' => array(
 174+ 'forms/rapidhtml/css/lp1.css',
 175+ 'forms/rapidhtml/css/Webitects.css',
 176+ ),
 177+ 'scripts' => array(
 178+ 'forms/rapidhtml/js/jquery.ezpz_hint.js',
 179+ ),
 180+ 'dependencies' => array(
 181+ 'jquery.ui.accordion'
 182+ ),
 183+ 'localBasePath' => dirname( __FILE__ ),
 184+ 'remoteExtPath' => 'DonationInterface/payflowpro_gateway'
 185+);
 186+
171187 function payflowGatewayConnection() {
172188 global $wgPayflowGatewayDBserver, $wgPayflowGatewayDBname;
173189 global $wgPayflowGatewayDBuser, $wgPayflowGatewayDBpassword;

Follow-up revisions

RevisionCommit summaryAuthorDate
r100196Merging the fundraising branch of DonationInterface back into trunk....khorn00:47, 19 October 2011

Status & tagging log