Changeset 2476097
- Timestamp:
- 02/17/2021 07:09:34 AM (5 years ago)
- Location:
- ebecas/trunk
- Files:
-
- 7 added
- 6 edited
-
eit-ebecas.php (modified) (2 diffs)
-
includes/Eit_Ebecas_Controller.php (modified) (1 diff)
-
includes/css/images (added)
-
includes/css/images/loader-eit.gif (added)
-
includes/css/images/ui-bg_glass_55_fbf9ee_1x400.png (added)
-
includes/css/images/ui-bg_glass_65_ffffff_1x400.png (added)
-
includes/css/images/ui-bg_glass_75_e6e6e6_1x400.png (added)
-
includes/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png (added)
-
includes/css/images/ui-icons_222222_256x240.png (added)
-
includes/css/styles.css (modified) (2 diffs)
-
includes/js/scripts.js (modified) (5 diffs)
-
public/Eit_Ebecas_Student_Portal.php (modified) (1 diff)
-
readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
ebecas/trunk/eit-ebecas.php
r2472173 r2476097 5 5 Plugin URI: https://ebecas.com.au/wordpress-plugin 6 6 Description: Using this plugin students can submit online application directly from school/college website. Submitted application with student details along with course and other products will be recorded in eBecas for further processing. 7 Version: 3.0. 37 Version: 3.0.4 8 8 Requires at least: 5.3 9 9 Requires PHP: 7.0 … … 35 35 define( 'EIT_EBECAS_PLUGIN', __FILE__ ); 36 36 37 define( 'EIT_EBECAS_VERSION', '3.0. 3' );37 define( 'EIT_EBECAS_VERSION', '3.0.4' ); 38 38 39 39 define( 'EIT_EBECAS_REQUIRED_WP_VERSION', '5.3' ); -
ebecas/trunk/includes/Eit_Ebecas_Controller.php
r2472173 r2476097 28 28 $eit_ebecas = array( 29 29 'ajaxurl' => admin_url( 'admin-ajax.php' ), 30 'images_dir' => plugins_url( 'images/', __FILE__ ),31 30 'security' => wp_create_nonce( 'eit_ebecas_security_nounce' ), 32 31 'email_verification_enabled' => $service->is_enabled() ? Eit_Ebecas_Email_Verification::EMAIL_VERIFICATION_ENABLED : Eit_Ebecas_Email_Verification::EMAIL_VERIFICATION_DISABLED, -
ebecas/trunk/includes/css/styles.css
r2472173 r2476097 639 639 640 640 /*--------------------------Sending code----------------------------------------------------------*/ 641 #sending_code, #products_loading {641 #sending_code, #products_loading, #calculate_price { 642 642 background-color: #f7f7f7; 643 643 border-radius: 13px; … … 647 647 border-color: #0acffe !important; 648 648 border: 1px solid; 649 } 650 651 .loading-overlay-img { 652 width: 50px; 653 height: 50px; 654 border-radius: 5px; 655 pointer-events: none; 649 font-size: 15px; 650 } 651 652 #loader-image { 653 background: #f7f7f7 url("images/loader-eit.gif") center no-repeat; 654 background-size: 40px; 655 width: 35px; 656 height: 20px; 657 display: inline-block; 658 vertical-align: text-bottom; 656 659 } 657 660 -
ebecas/trunk/includes/js/scripts.js
r2472173 r2476097 236 236 console.log('Application Code'); 237 237 $("#sending_code").remove(); 238 $('<p id="sending_code"><small>Sending Application Code...</small>' + 239 '<img src= "' + eit_ebecas.images_dir + 'loader-eit.gif" class= "loading-overlay-img"/>' + 240 '</p>').insertAfter('.eit-email'); 238 $('<p id="sending_code"><span id="loader-image"></span>Sending application code...</p>') 239 .insertAfter('.eit-email'); 241 240 242 241 // send application code to user's email … … 297 296 } 298 297 298 299 299 $app.selection.location_id = locationId; 300 300 console.log('location selected'); … … 303 303 }); 304 304 305 // check if only location which is selected then 306 // load courses for selected location. 307 let selected_location_id = $field_location.val(); 308 if (selected_location_id) { 309 $field_location.trigger('change'); 310 } 311 305 312 function getProducts(type, callback = null) { 306 313 console.log(type); 307 314 308 315 if (type == PRODUCT_TYPE_COURSE) { 309 $('<p id="products_loading"><small>Loading...</small>' + 310 '<img src= "' + eit_ebecas.images_dir + 'loader-eit.gif" class= "loading-overlay-img"/>' + 311 '</p>').insertAfter('#eit-location-select'); 316 $('<p id="products_loading"><span id="loader-image"></span>Loading...</p>') 317 .insertAfter('#eit-location-select'); 312 318 } 313 319 … … 478 484 479 485 if (type == FACULTY_TYPE_ENDDATE) { 480 $('<p id = "calutlate_loading"><small>Calculating...</small>' + 481 '<img src= "' + eit_ebecas.images_dir + 'loader-eit.gif" class= "loading-overlay-img"/>' + 482 '</p>').insertAfter($section_course_date_price); 486 $('<p id="calculate_price"><span id="loader-image"></span>Calculating...</p>') 487 .insertAfter($section_course_date_price); 483 488 $.extend(data, { 484 489 eit_ebecas_weeks: parseInt(weeks.val()), … … 499 504 let data = JSON.parse(response.data); 500 505 if (type == FACULTY_TYPE_ENDDATE) { 501 $("#cal utlate_loading").remove();506 $("#calculate_price").remove(); 502 507 endDate.val(moment(data.EndDate, 'YYYY-MM-DD').format('DD-MM-YYYY')); 503 508 } else { -
ebecas/trunk/public/Eit_Ebecas_Student_Portal.php
r2472173 r2476097 93 93 } 94 94 95 if ( count( $locations ) == 1 && empty( $selected_location ) ) { 96 $selected_location = $locations[0]['LocationId']; 97 } 98 95 99 $options_markup = '<label for="eit_ebecas_location">College Location <strong>*</strong></label>'; 96 100 $options_markup .= '<select name="eit_ebecas_location" required>'; 97 101 $options_markup .= '<option value="">Select Location</option>'; 98 102 foreach ( $locations as $location ) { 99 $options_markup .= sprintf( '<option value="%s" %s>%s</option>', $location['LocationId'], selected( $location['LocationId'], $selected_location, false ), $location['LocationName'] );103 $options_markup .= sprintf( '<option value="%s" %s>%s</option>', $location['LocationId'], selected( $location['LocationId'], $selected_location, false ), $location['LocationName'] ); 100 104 } 101 105 $options_markup .= '</select>'; -
ebecas/trunk/readme.txt
r2472173 r2476097 5 5 Requires at least: 5.3 6 6 Tested up to: 5.6 7 Stable tag: 3.0. 37 Stable tag: 3.0.4 8 8 Requires PHP: 7.0 9 9 License: GPLv2 or later … … 119 119 120 120 == Changelog == 121 = 3.0.4 = 122 * Added support for single school location 123 * Fixed loading images bug for jquery ui and loader 124 121 125 = 3.0.3 = 122 126 * UI improvements
Note: See TracChangeset
for help on using the changeset viewer.