Skip to content
This repository was archived by the owner on Feb 14, 2022. It is now read-only.

Commit 3f85500

Browse files
committed
Merge branch 'release/1.8.7.2'
2 parents 0ba17dc + 197d612 commit 3f85500

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+13313
-13741
lines changed

change_log.txt

Lines changed: 265 additions & 2 deletions
Large diffs are not rendered by default.

common.php

Lines changed: 5982 additions & 5862 deletions
Large diffs are not rendered by default.

css/admin.css

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1400,6 +1400,16 @@ div.detail-note-content p {
14001400
line-height: 1.8;
14011401
}
14021402

1403+
div.detail-note-content.gforms_note_success{
1404+
background-color: #ECFCDE;
1405+
border: 1px solid #A7C886;
1406+
1407+
}
1408+
div.detail-note-content.gforms_note_error{
1409+
background-color: #FFEBE8;
1410+
border: 1px solid #CC0000;
1411+
1412+
}
14031413
/* edit details form styles ------------------------------------------------------*/
14041414

14051415
#namediv_admin {
@@ -2584,13 +2594,6 @@ div#gravity-title-icon {
25842594
background-position: 0 -350px;
25852595
}
25862596

2587-
div#publishing-action {
2588-
float: none !important;
2589-
text-align: left !important;
2590-
clear: both;
2591-
margin: 14px 0 5px
2592-
}
2593-
25942597
div#major-publishing-actions {
25952598
clear: both;
25962599
}

css/datepicker.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
Gravity Forms Date Picker Styles
55
http: //www.gravityforms.com
6-
updated: October 15, 2013 11:05 AM
6+
updated: January 31, 2014 3:32 PM
77
88
Customized styles for the jQuery UI Datepicker 1.9.2
99
copyright 2012 jQuery Foundation and other contributors
@@ -12,7 +12,7 @@ http://jquery.org/license
1212
some styles courtesty of http://www.hongkiat.com/
1313
1414
Gravity Forms is a Rocketgenius project
15-
copyright 2013 Rocketgenius Inc.
15+
copyright 2008 - 2014 Rocketgenius Inc.
1616
http: //www.rocketgenius.com
1717
1818
NOTE: DO NOT EDIT THIS FILE! MAKE ANY MODIFICATIONS IN YOUR
@@ -51,7 +51,7 @@ to no.
5151
background-color: #666; /* set the header background color */
5252
color: #e0e0e0;
5353
font-weight: bold;
54-
-webkit-box-shadow: inset 0px 1px 1px 0px rgba(250, 250, 250, 2);
54+
-webkit-box-shadow: inset 0px 1px 1px 0px rgba(250, 250, 250, .2);
5555
-moz-box-shadow: inset 0px 1px 1px 0px rgba(250, 250, 250, .2);
5656
box-shadow: inset 0px 1px 1px 0px rgba(250, 250, 250, .2);
5757
text-shadow: 1px -1px 0px #000;

css/formsmain.css

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
Gravity Forms Front End Form Styles
55
Version 1.8
66
http: //www.gravityforms.com
7-
updated: December 12 2013, 12:07 PM
7+
updated: January 31, 2014 3:35 PM
88
99
Gravity Forms is a Rocketgenius project
10-
copyright 2013 Rocketgenius Inc.
10+
copyright 2008-2014 Rocketgenius Inc.
1111
http: //www.rocketgenius.com
1212
this may not be redistributed without the
1313
express written permission of the author.
@@ -1325,7 +1325,7 @@ body .gform_wrapper div.gform_body ul.gform_fields li.gfield.gfield_html dl dd {
13251325
background-image: -webkit-linear-gradient(center bottom, #EEE 0%, white 50%);
13261326
background-image: -moz-linear-gradient(center bottom, #EEE 0%, white 50%);
13271327
background-image: -o-linear-gradient(top, #EEE 0%,#FFF 50%);
1328-
background-image: -ms-linear-gradient(top, #EEE 0%,#FFF 50%); filter: progid: DXImageTransform.Microsoft.gradient( startColorstr='#EEE', endColorstr='#FFF',GradientType=0 );
1328+
background-image: -ms-linear-gradient(top, #EEE 0%,#FFF 50%); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#EEE', endColorstr='#FFF',GradientType=0 );
13291329
background-image: linear-gradient(top, #EEE 0%,#FFF 50%);
13301330
-webkit-border-radius: 4px;
13311331
-moz-border-radius: 4px;
@@ -1367,7 +1367,7 @@ body .gform_wrapper div.gform_body ul.gform_fields li.gfield.gfield_html dl dd {
13671367
background-image: -moz-linear-gradient(center bottom, #CCC 0%, #EEE 60%);
13681368
background-image: -o-linear-gradient(bottom, #CCC 0%, #EEE 60%);
13691369
background-image: -ms-linear-gradient(top, #CCC 0%,#EEE 60%);
1370-
filter: progid: DXImageTransform.Microsoft.gradient( startColorstr='#CCC', endColorstr='#EEE',GradientType=0 );
1370+
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#CCC', endColorstr='#EEE',GradientType=0 );
13711371
background-image: linear-gradient(top, #CCC 0%,#EEE 60%);
13721372
border-left: 1px solid #AAA;
13731373
position: absolute;
@@ -1426,7 +1426,7 @@ body .gform_wrapper div.gform_body ul.gform_fields li.gfield.gfield_html dl dd {
14261426
background-image: -moz-linear-gradient(center bottom, white 85%, #EEE 99%);
14271427
background-image: -o-linear-gradient(bottom, white 85%, #EEE 99%);
14281428
background-image: -ms-linear-gradient(top, #FFF 85%,#EEE 99%);
1429-
filter: progid: DXImageTransform.Microsoft.gradient( startColorstr='#FFF', endColorstr='#EEE',GradientType=0 );
1429+
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FFF', endColorstr='#EEE',GradientType=0 );
14301430
background-image: linear-gradient(top, #FFF 85%,#EEE 99%);
14311431
border: 1px solid #AAA;
14321432
margin: 0;
@@ -1478,7 +1478,7 @@ body .gform_wrapper div.gform_body ul.gform_fields li.gfield.gfield_html dl dd {
14781478
background-image: -moz-linear-gradient(center bottom, #E4E4E4 0%, #EEE 70%);
14791479
background-image: -o-linear-gradient(bottom, #E4E4E4 0%, #EEE 70%);
14801480
background-image: -ms-linear-gradient(top, #E4E4E4 0%,#EEE 70%);
1481-
filter: progid: DXImageTransform.Microsoft.gradient( startColorstr='#E4E4E4', endColorstr='#EEE',GradientType=0 );
1481+
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#E4E4E4', endColorstr='#EEE',GradientType=0 );
14821482
background-image: linear-gradient(top, #E4E4E4 0%,#EEE 70%);
14831483
color: #333;
14841484
border: 1px solid #B4B4B4;
@@ -1509,7 +1509,7 @@ body .gform_wrapper div.gform_body ul.gform_fields li.gfield.gfield_html dl dd {
15091509
background-repeat: no-repeat;
15101510
}
15111511

1512-
.gform_wrapper .chzn-container-multi .chzn-choices .search-choice .search-choice-close: hover {
1512+
.gform_wrapper .chzn-container-multi .chzn-choices .search-choice .search-choice-close:hover {
15131513
background-position: right -9px;
15141514
}
15151515

@@ -1594,7 +1594,7 @@ body .gform_wrapper div.gform_body ul.gform_fields li.gfield.gfield_html dl dd {
15941594
background-image: -moz-linear-gradient(center bottom, white 0%, #EEE 50%);
15951595
background-image: -o-linear-gradient(bottom, white 0%, #EEE 50%);
15961596
background-image: -ms-linear-gradient(top, #FFF 0%,#EEE 50%);
1597-
filter: progid: DXImageTransform.Microsoft.gradient( startColorstr='#FFF', endColorstr='#EEE',GradientType=0 );
1597+
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FFF', endColorstr='#EEE',GradientType=0 );
15981598
background-image: linear-gradient(top, #FFF 0%,#EEE 50%);
15991599
-webkit-border-bottom-left-radius : 0;
16001600
-webkit-border-bottom-right-radius: 0;

css/rtl.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1+
12
/*
23
----------------------------------------------------------------
34
45
rtl.css
56
Gravity Forms RTL Language Support
67
http://www.gravityforms.com
7-
updated: May 7, 2013 10:52 PM
8+
updated: February 24, 2014 7:49 AM
89
910
Gravity Forms is a Rocketgenius project
10-
copyright 2013 Rocketgenius Inc.
11+
copyright 2013-2014 Rocketgenius Inc.
1112
http: //www.rocketgenius.com
1213
this may not be redistributed without the
1314
express written permission of the author.
@@ -508,7 +509,6 @@ html[dir="rtl"] body.wp-admin .gform_tabs li.active a {
508509
html[dir="rtl"] body.wp-admin a.tooltip,
509510
html[dir="rtl"] body.wp-admin a.tooltip_left,
510511
html[dir="rtl"] body.wp-admin a.tooltip_bottomleft {
511-
text-indent: 9000px;
512512
overflow: hidden;
513513
}
514514

currency.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
<?php
2+
3+
if(!class_exists('GFForms')){
4+
die();
5+
}
6+
27
if(!class_exists("RGCurrency")){
38

49
class RGCurrency{

entry_detail.php

Lines changed: 87 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
<?php
2+
3+
if(!class_exists('GFForms')){
4+
die();
5+
}
6+
27
class GFEntryDetail{
38

49
public static function lead_detail_page(){
@@ -46,9 +51,14 @@ public static function lead_detail_page(){
4651
$key = $key_array[0];
4752
$val = $key_array[1] . ":" . $val;
4853
}
54+
$type = rgget("type");
55+
if(empty($type)){
56+
$type = rgget("field_id") == "0" ? "global" : "field";
57+
}
58+
4959
$search_criteria["field_filters"][] = array(
5060
"key" => $key,
51-
"type" => rgempty("type", $_GET) ? "field" : rgget("type"),
61+
"type" => $type,
5262
"operator" => rgempty("operator", $_GET) ? "is" : rgget("operator"),
5363
"value" => $val
5464
);
@@ -157,6 +167,8 @@ public static function lead_detail_page(){
157167

158168
case "delete" :
159169
check_admin_referer('gforms_save_entry', 'gforms_save_entry');
170+
if(!GFCommon::current_user_can_any("gravityforms_delete_entries"))
171+
die(__("You don't have adequate permissions to delete entries.", "gravityforms"));
160172
RGFormsModel::delete_lead($lead["id"]);
161173
?>
162174
<script type="text/javascript">
@@ -321,9 +333,10 @@ function toggleNotificationOverride(isInit) {
321333
<div id="side-info-column" class="inner-sidebar">
322334
<?php do_action("gform_entry_detail_sidebar_before", $form, $lead); ?>
323335

336+
<!-- INFO BOX -->
324337
<div id="submitdiv" class="stuffbox">
325338
<h3>
326-
<span class="hndle"><?php _e("Info", "gravityforms"); ?></span>
339+
<span class="hndle"><?php _e("Entry", "gravityforms"); ?></span>
327340
</h3>
328341
<div class="inside">
329342
<div id="submitcomment" class="submitbox">
@@ -377,10 +390,13 @@ function toggleNotificationOverride(isInit) {
377390
}
378391
}
379392
do_action("gform_entry_info", $form["id"], $lead);
393+
394+
//Placing this hook here temporarily so that addons can switch over to it. Then this hook will be moved to the separate (new) Payment Detail box.
395+
do_action("gform_payment_details", $form["id"], $lead);
380396
?>
381397
</div>
382398
<div id="major-publishing-actions">
383-
<div>
399+
<div id="delete-action">
384400
<?php
385401
switch($lead["status"]){
386402
case "spam" :
@@ -445,10 +461,18 @@ function toggleNotificationOverride(isInit) {
445461
}
446462
?>
447463
</div>
464+
<div class="clear"></div>
448465
</div>
449466
</div>
450467
</div>
451468
</div>
469+
470+
<?php
471+
// if (!empty($lead["payment_status"])) {
472+
// self::payment_details_box($lead, $form);
473+
// }
474+
?>
475+
452476
<?php do_action("gform_entry_detail_sidebar_middle", $form, $lead); ?>
453477

454478
<?php if(GFCommon::current_user_can_any("gravityforms_edit_entry_notes") ) { ?>
@@ -526,7 +550,7 @@ function toggleNotificationOverride(isInit) {
526550
do_action("gform_entry_detail", $form, $lead);
527551

528552
if(GFCommon::current_user_can_any("gravityforms_view_entry_notes")) { ?>
529-
<div id="namediv" class="stuffbox">
553+
<div class="postbox">
530554
<h3>
531555
<label for="name"><?php _e("Notes", "gravityforms"); ?></label>
532556
</h3>
@@ -576,7 +600,7 @@ public static function lead_detail_edit($form, $lead){
576600
$form = apply_filters("gform_admin_pre_render_" . $form["id"], apply_filters("gform_admin_pre_render", $form));
577601
$form_id = $form["id"];
578602
?>
579-
<div id="namediv" class="stuffbox">
603+
<div class="postbox">
580604
<h3>
581605
<label for="name"><?php _e("Details", "gravityforms"); ?></label>
582606
</h3>
@@ -681,14 +705,15 @@ public static function notes_grid($notes, $is_editable, $emails = null, $autores
681705
<td class="entry-detail-note<?php echo $is_last ? " lastrow" : "" ?>">
682706
<?php
683707
}
708+
$class = $note->note_type ? " gforms_note_{$note->note_type}" : "";
684709
?>
685710
<div style="margin-top:4px;">
686-
<div class="note-avatar"><?php echo get_avatar($note->user_id, 48);?></div>
711+
<div class="note-avatar"><?php echo apply_filters("gform_notes_avatar", get_avatar($note->user_id, 48), $note);?></div>
687712
<h6 class="note-author"> <?php echo esc_html($note->user_name)?></h6>
688713
<p style="line-height:130%; text-align:left; margin-top:3px;"><a href="mailto:<?php echo esc_attr($note->user_email)?>"><?php echo esc_html($note->user_email) ?></a><br />
689714
<?php _e("added on", "gravityforms"); ?> <?php echo esc_html(GFCommon::format_date($note->date_created, false)) ?></p>
690715
</div>
691-
<div class="detail-note-content"><?php echo esc_html($note->value) ?></div>
716+
<div class="detail-note-content<?php echo $class ?>"><?php echo esc_html($note->value) ?></div>
692717
</td>
693718

694719
</tr>
@@ -925,5 +950,60 @@ public static function entry_detail_pagination_link($pos, $label = '', $class =
925950
return '<a ' . $href . ' class="' . $class . '" title="' . $label . '"><i class="fa-lg ' . $icon . '"></i></a></li>';
926951
}
927952

953+
/**
954+
* @param $lead
955+
* @param $form
956+
* @return mixed
957+
*/
958+
public static function payment_details_box($lead, $form)
959+
{
960+
?>
961+
<!-- PAYMENT BOX -->
962+
<div id="submitdiv" class="stuffbox">
963+
<h3>
964+
<span
965+
class="hndle"><?php echo $lead["transaction_type"] == 1 ? __("Payment Details", "gravityforms") : __("Subscription Details", "gravityforms"); ?></span>
966+
</h3>
967+
968+
<div class="inside">
969+
<div id="submitcomment" class="submitbox">
970+
<div id="minor-publishing" style="padding:10px;">
971+
<br/>
972+
<?php
973+
if (!empty($lead["payment_status"])) {
974+
echo __("Status", "gravityforms"); ?>: <span
975+
id="gform_payment_status"><?php echo apply_filters("gform_payment_status", $lead["payment_status"], $form, $lead) ?></span>
976+
<br/><br/>
977+
<?php
978+
if (!empty($lead["payment_date"])) {
979+
echo __("Date", "gravityforms") ?>: <?php echo GFCommon::format_date($lead["payment_date"], false, "Y/m/d", $lead["transaction_type"] == 1) ?>
980+
<br/><br/>
981+
<?php
982+
}
983+
984+
if (!empty($lead["transaction_id"])) {
985+
echo $lead["transaction_type"] == 1 ? __("Transaction Id", "gravityforms") : __("Subscription Id", "gravityforms"); ?>: <?php echo $lead["transaction_id"] ?>
986+
<br/><br/>
987+
<?php
988+
}
989+
990+
if (!rgblank($lead["payment_amount"])) {
991+
echo $lead["transaction_type"] == 1 ? __("Amount", "gravityforms") : __("Recurring Amount", "gravityforms"); ?>: <?php echo GFCommon::to_money($lead["payment_amount"], $lead["currency"]) ?>
992+
<br/><br/>
993+
<?php
994+
}
995+
}
996+
do_action("gform_payment_details", $form["id"], $lead);
997+
998+
?>
999+
</div>
1000+
</div>
1001+
</div>
1002+
</div>
1003+
<?php
1004+
}
1005+
1006+
1007+
9281008
}
9291009
?>

0 commit comments

Comments
 (0)