Skip to content

Commit

Permalink
Merge pull request #1 from WordImpress/master
Browse files Browse the repository at this point in the history
Update Forked Directory 15th May
  • Loading branch information
mehul0810 authored May 15, 2017
2 parents 3f70b91 + 89d8ccf commit 3e9a1e5
Show file tree
Hide file tree
Showing 99 changed files with 4,889 additions and 3,559 deletions.
8 changes: 8 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/.* export-ignore
CHANGELOG.txt export-ignore
composer.* export-ignore
package.json export-ignore
phpcs.ruleset.xml export-ignore
phpunit.* export-ignore
README.md export-ignore
tests export-ignore
23 changes: 11 additions & 12 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,29 +1,28 @@
## Issue Overview

<!--- This is a brief overview of the issue. --->
<!-- This is a brief overview of the issue. --->

## Expected Behavior
<!--- If you're describing a bug, tell us what should happen -->
<!--- If you're suggesting a change/improvement, tell us how it should work -->
<!-- If you're describing a bug, tell us what should happen -->
<!-- If you're suggesting a change/improvement, tell us how it should work -->

## Current Behavior
<!--- If describing a bug, tell us what happens instead of the expected behavior -->
<!--- If suggesting a change/improvement, explain the difference from current behavior -->
<!-- If describing a bug, tell us what happens instead of the expected behavior -->
<!-- If suggesting a change/improvement, explain the difference from current behavior -->

## Possible Solution
<!--- Not obligatory, but suggest a fix/reason for the bug, -->
<!--- or ideas how to implement the addition or change -->
<!-- Not obligatory, but suggest a fix/reason for the bug, -->
<!-- or ideas how to implement the addition or change -->

## Steps to Reproduce (for bugs)
<!--- Provide a link to a live example, or an unambiguous set of steps to -->
<!--- reproduce this bug. Include code to reproduce, if relevant -->
<!-- Provide a link to a live example, or an unambiguous set of steps to -->
<!-- reproduce this bug. Include code to reproduce, if relevant -->
1.
2.
3.
4.

## Related PRs
List related PRs against other branches:
## Related Issues and/or PRs
<!-- List related issues or PRs against other branches: -->

## Todos
- [ ] Tests
Expand Down
16 changes: 8 additions & 8 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
## Description
<!--- Please describe your changes -->
<!-- Please describe your changes -->

## How Has This Been Tested?
<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, tests ran to see how -->
<!--- your change affects other areas of the code, etc. -->
<!-- Please describe in detail how you tested your changes. -->
<!-- Include details of your testing environment, tests ran to see how -->
<!-- your change affects other areas of the code, etc. -->

## Screenshots (jpeg or gifs if applicable):

## Types of changes
<!--- What types of changes does your code introduce? -->
<!--- Bug fix (non-breaking change which fixes an issue) -->
<!--- New feature (non-breaking change which adds functionality) -->
<!--- Breaking change (fix or feature that would cause existing functionality to not work as expected) -->
<!-- What types of changes does your code introduce? -->
<!-- Bug fix (non-breaking change which fixes an issue) -->
<!-- New feature (non-breaking change which adds functionality) -->
<!-- Breaking change (fix or feature that would cause existing functionality to not work as expected) -->

## Checklist:
- [ ] My code is tested.
Expand Down
35 changes: 15 additions & 20 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,28 @@ language: php
sudo: false

php:
- 5.2
- 5.3
- 5.4
- 5.5
- 5.6
- 7.0
- hhvm
- 5.3
- 5.6
- 7.0
- 7.1
- hhvm

env:
- WP_VERSION=latest WP_MULTISITE=0
- WP_VERSION=4.5 WP_MULTISITE=0
- WP_VERSION=4.4 WP_MULTISITE=0
- WP_VERSION=4.3 WP_MULTISITE=0
- WP_VERSION=latest WP_MULTISITE=0 PHP_LATEST_STABLE=7.1

matrix:
include:
- php: 5.6
env: WP_VERSION=latest WP_MULTISITE=1
- php: 5.6
env: WP_VERSION=latest WP_MULTISITE=1 PHP_LATEST_STABLE=7.1

before_script:
- bash tests/bin/install.sh wordpress_test root '' localhost $WP_VERSION
- bash tests/bin/travis.sh before
- export PATH="$HOME/.composer/vendor/bin:$PATH"
- bash tests/bin/install.sh give_test root '' localhost $WP_VERSION
- bash tests/bin/travis.sh before

script: phpunit -c phpunit.xml
script:
- bash tests/bin/phpunit.sh
- bash tests/bin/travis.sh during

after_script:
- bash tests/bin/travis.sh after

notifications:
slack: givewp:AgWxvdTjTkSjd8FHM5ndeSH5
- bash tests/bin/travis.sh after
31 changes: 24 additions & 7 deletions assets/css/give-admin-rtl.css
Original file line number Diff line number Diff line change
Expand Up @@ -1069,7 +1069,7 @@ ASIDE

#give-metabox-form-data .give-metabox-tabs {
margin: 0;
min-width: 170px;
max-width: 170px;
float: right;
line-height: 1em;
padding: 0 0 10px;
Expand Down Expand Up @@ -1863,12 +1863,29 @@ h2.give-nav-tab-wrapper {
height: 35px; }

@media screen and (max-width: 600px) {
h2.give-nav-tab-wrapper {
height: 50px; } }

@media screen and (max-width: 414px) {
.give-nav-tab-wrapper > a {
width: 75%; } }
.give-nav-tab-wrapper {
position: relative;
padding-top: 0 !important; }
.give-nav-tab-wrapper > a {
width: 100%;
box-sizing: border-box;
margin: 0; }
.give-nav-tab-wrapper > a:hover {
border-bottom: 1px solid #ccc; }
.give-nav-tab-wrapper div.give-sub-nav-tab-wrapper {
position: absolute;
top: 0;
left: 0; }
.give-nav-tab-wrapper div.give-sub-nav-tab-wrapper #give-show-sub-nav {
height: 28px;
width: 30px;
border-radius: 0;
margin: 0; }
.give-nav-tab-wrapper div.give-sub-nav-tab-wrapper #give-show-sub-nav > span.dashicons {
margin: 6px auto 0;
display: block; }
.give-nav-tab-wrapper div.give-sub-nav-tab-wrapper nav.give-sub-nav-tab {
top: 35px; } }

.give-sub-nav-tab-wrapper {
position: relative;
Expand Down
2 changes: 1 addition & 1 deletion assets/css/give-admin-rtl.min.css

Large diffs are not rendered by default.

31 changes: 24 additions & 7 deletions assets/css/give-admin.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/css/give-admin.min.css

Large diffs are not rendered by default.

39 changes: 22 additions & 17 deletions assets/js/admin/admin-scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,17 @@ jQuery.noConflict();
* @returns {string}
*/
function give_unformat_currency(price, dp) {
price = accounting.unformat(price, give_vars.decimal_separator).toString();
price = accounting.unformat(price, give_vars.decimal_separator).toString();
dp = ( 'undefined' == dp ? false : dp );

var decimal_position = price.indexOf('.');

// Set default value for number of decimals.
if (false != dp) {
if ( false !== dp ) {
price = parseFloat(price).toFixed(dp);

// If price do not have decimal value then set default number of decimals.
} else if (
( -1 === decimal_position )
|| ( give_vars.currency_decimals > price.substr(decimal_position + 1).length )
) {
// If price do not have decimal value then set default number of decimals.
} else {
price = parseFloat(price).toFixed(give_vars.currency_decimals);
}

Expand Down Expand Up @@ -222,7 +221,12 @@ jQuery.noConflict();
variable_prices_html_container = $('.give-donation-level');

// Check for form ID.
if (!( give_form_id = $(this).val() )) {
if ( ! ( give_form_id = $(this).val() )) {
return false;
}

// Bailout.
if( ! variable_prices_html_container.length ) {
return false;
}

Expand Down Expand Up @@ -1360,9 +1364,10 @@ jQuery.noConflict();

// Get max level id.
$('input[type="hidden"].give-levels_id', $this).each(function (index, item) {
var $item = $(item);
if (max_level_id < $item.val()) {
max_level_id = $item.val();
var $item = $(item),
current_level = parseInt( $item.val() );
if (max_level_id < current_level ) {
max_level_id = current_level;
}
});

Expand Down Expand Up @@ -1663,10 +1668,10 @@ jQuery.noConflict();

// Format price sting of input field on focusout.
$('#poststuff').on('focusout', 'input.give-money-field, input.give-price-field', function () {
price_string = give_unformat_currency($(this).val(), false);
price_string = give_unformat_currency( $(this).val(), false );

// Back out.
if (!parseInt(price_string)) {
if ( give_unformat_currency( '0', false ) === give_unformat_currency( $(this).val(), false ) ) {
$(this).val('');
return false;
}
Expand Down Expand Up @@ -1707,21 +1712,21 @@ jQuery.noConflict();
});

// Render setting tab.
give_render_responsinve_tabs();
give_render_responsive_tabs();
});
})(jQuery);

/**
* Responsive js.
*/
jQuery(window).resize(function () {
give_render_responsinve_tabs();
give_render_responsive_tabs();
});

/**
* Render responsive tabs
*/
function give_render_responsinve_tabs() {
function give_render_responsive_tabs() {
var $setting_page_form = jQuery('.give-settings-page'),
$main_tab_nav = jQuery('h2.give-nav-tab-wrapper'),
setting_page_form_width = $setting_page_form.width(),
Expand All @@ -1732,7 +1737,7 @@ function give_render_responsinve_tabs() {
$hide_tabs = [],
tab_width = 0;

if( 414 < jQuery(window).outerWidth() ) {
if( 600 < jQuery(window).outerWidth() ) {
tab_width = 200;
}

Expand Down
2 changes: 1 addition & 1 deletion assets/js/admin/admin-scripts.min.js

Large diffs are not rendered by default.

Loading

0 comments on commit 3e9a1e5

Please sign in to comment.