The Events Calendar - Version 1.6.3

Version Description

Features

  • iCal import sorted options: post, category, all

Bugs

  • List Widget: eliminate empty li tags when there are no upcoming events (thanks to tokidoki2005)
  • prev / next month links in grid view remain in subcategory of Events
  • remove calls to non-existent images
  • List Widget now follows display choices made in admin
  • gmap display choices persistent across plugin updates
  • better field validation when collecting post meta about events
Download this release

Release Info

Developer justinendler
Plugin Icon The Events Calendar
Version 1.6.3
Comparing to
See all releases

Code changes from version 1.6.2 to 1.6.3

Files changed (14) hide show
  1. events-list-widget.class.php +11 -8
  2. lang/the-events-calendar.pot +108 -94
  3. readme.txt +19 -4
  4. resources/events.css +1 -2
  5. template-tags.php +58 -46
  6. the-events-calendar.class.php +54 -6
  7. the-events-calendar.php +1 -1
  8. views/events-list-load-widget-admin.php +49 -19
  9. views/events-list-load-widget-display.php +39 -14
  10. views/events-meta-box.php +2 -9
  11. views/events-options.php +1 -0
  12. views/gridview.php +5 -1
  13. views/list.php +7 -2
  14. views/single.php +4 -2
events-list-widget.class.php CHANGED
@@ -30,7 +30,9 @@ if( !class_exists( 'Events_List_Widget' ) ) {
30
  $limit = $instance['limit'];
31
  $noUpcomingEvents = $instance['no_upcoming_events'];
32
  $start = $instance['start'];
 
33
  $end = $instance['end'];
 
34
  $venue = $instance['venue'];
35
  $address = $instance['address'];
36
  $city = $instance['city'];
@@ -46,9 +48,6 @@ if( !class_exists( 'Events_List_Widget' ) ) {
46
  } else {
47
  $event_url = events_get_gridview_link();
48
  }
49
-
50
- /* Before widget (defined by themes). */
51
- echo $before_widget;
52
 
53
  if( function_exists( 'get_events' ) ) {
54
  $old_display = $wp_query->get('eventDisplay');
@@ -56,14 +55,14 @@ if( !class_exists( 'Events_List_Widget' ) ) {
56
  $posts = get_events($limit, The_Events_Calendar::CATEGORYNAME);
57
  }
58
 
 
59
  /* Title of widget (before and after defined by themes). */
60
- if ( $title && !$noUpcomingEvents ) echo $before_title . $title . $after_title;
61
 
62
  if( $posts ) {
63
  /* Display list of events. */
64
  if( function_exists( 'get_events' ) ) {
65
-
66
- echo "<ul class='upcoming'>";
67
  foreach( $posts as $post ) :
68
  setup_postdata($post);
69
  if (file_exists(TEMPLATEPATH.'/events/events-list-load-widget-display.php') ) {
@@ -82,7 +81,7 @@ if( !class_exists( 'Events_List_Widget' ) ) {
82
  } else if( !$noUpcomingEvents ) _e('There are no upcoming events at this time.', $this->pluginDomain);
83
 
84
  /* After widget (defined by themes). */
85
- echo $after_widget;
86
  }
87
 
88
  function update( $new_instance, $old_instance ) {
@@ -93,7 +92,11 @@ if( !class_exists( 'Events_List_Widget' ) ) {
93
  $instance['limit'] = strip_tags( $new_instance['limit'] );
94
  $instance['no_upcoming_events'] = strip_tags( $new_instance['no_upcoming_events'] );
95
  $instance['start'] = strip_tags( $new_instance['start'] );
 
 
96
  $instance['end'] = strip_tags( $new_instance['end'] );
 
 
97
  $instance['venue'] = strip_tags( $new_instance['venue'] );
98
  $instance['country'] = strip_tags( $new_instance['country'] );
99
  $instance['address'] = strip_tags( $new_instance['address'] );
@@ -109,7 +112,7 @@ if( !class_exists( 'Events_List_Widget' ) ) {
109
 
110
  function form( $instance ) {
111
  /* Set up default widget settings. */
112
- $defaults = array( 'title' => 'Upcoming Events', 'limit' => '5', 'start' => true, 'end' => false, 'venue' => false, 'country' => true, 'address' => false, 'city' => true, 'state' => true, 'province' => true, 'zip' => false, 'phone' => false, 'cost' => false);
113
  $instance = wp_parse_args( (array) $instance, $defaults );
114
  include( dirname( __FILE__ ) . '/views/events-list-load-widget-admin.php' );
115
  }
30
  $limit = $instance['limit'];
31
  $noUpcomingEvents = $instance['no_upcoming_events'];
32
  $start = $instance['start'];
33
+ $startTime = $instance['start-time'];
34
  $end = $instance['end'];
35
+ $endTime = $instance['end-time'];
36
  $venue = $instance['venue'];
37
  $address = $instance['address'];
38
  $city = $instance['city'];
48
  } else {
49
  $event_url = events_get_gridview_link();
50
  }
 
 
 
51
 
52
  if( function_exists( 'get_events' ) ) {
53
  $old_display = $wp_query->get('eventDisplay');
55
  $posts = get_events($limit, The_Events_Calendar::CATEGORYNAME);
56
  }
57
 
58
+ /* Before widget (defined by themes). */
59
  /* Title of widget (before and after defined by themes). */
60
+ if ( $title && !$noUpcomingEvents ) echo $before_widget . $before_title . $title . $after_title;
61
 
62
  if( $posts ) {
63
  /* Display list of events. */
64
  if( function_exists( 'get_events' ) ) {
65
+ echo '<ul class="upcoming">';
 
66
  foreach( $posts as $post ) :
67
  setup_postdata($post);
68
  if (file_exists(TEMPLATEPATH.'/events/events-list-load-widget-display.php') ) {
81
  } else if( !$noUpcomingEvents ) _e('There are no upcoming events at this time.', $this->pluginDomain);
82
 
83
  /* After widget (defined by themes). */
84
+ if ( !$noUpcomingEvents ) echo $after_widget;
85
  }
86
 
87
  function update( $new_instance, $old_instance ) {
92
  $instance['limit'] = strip_tags( $new_instance['limit'] );
93
  $instance['no_upcoming_events'] = strip_tags( $new_instance['no_upcoming_events'] );
94
  $instance['start'] = strip_tags( $new_instance['start'] );
95
+ if( $instance['start'] == 'on' ) $instance['start-time'] = strip_tags( $new_instance['start-time'] );
96
+ else $instance['start-time'] = '';
97
  $instance['end'] = strip_tags( $new_instance['end'] );
98
+ if( $instance['end'] == 'on' ) $instance['end-time'] = strip_tags( $new_instance['end-time'] );
99
+ else $instance['end-time'] = '';
100
  $instance['venue'] = strip_tags( $new_instance['venue'] );
101
  $instance['country'] = strip_tags( $new_instance['country'] );
102
  $instance['address'] = strip_tags( $new_instance['address'] );
112
 
113
  function form( $instance ) {
114
  /* Set up default widget settings. */
115
+ $defaults = array( 'title' => 'Upcoming Events', 'limit' => '5', 'start' => 'on', 'start-time' => '','end' => '', 'end-time' => '', 'venue' => '', 'country' => 'on', 'address' => '', 'city' => 'on', 'state' => 'on', 'province' => 'on', 'zip' => '', 'phone' => '', 'cost' => '');
116
  $instance = wp_parse_args( (array) $instance, $defaults );
117
  include( dirname( __FILE__ ) . '/views/events-list-load-widget-admin.php' );
118
  }
lang/the-events-calendar.pot CHANGED
@@ -1,4 +1,4 @@
1
- # Translation of the WordPress plugin The Events Calendar 1.6 by Shane & Peter, Inc..
2
  # Copyright (C) 2010 Shane & Peter, Inc.
3
  # This file is distributed under the same license as the The Events Calendar package.
4
  # FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
@@ -6,9 +6,9 @@
6
  #, fuzzy
7
  msgid ""
8
  msgstr ""
9
- "Project-Id-Version: The Events Calendar 1.6\n"
10
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/the-events-calendar\n"
11
- "POT-Creation-Date: 2010-06-01 16:40+0000\n"
12
  "PO-Revision-Date: 2010-MO-DA HO:MI+ZONE\n"
13
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,7 +25,7 @@ msgid "Events Calendar"
25
  msgstr ""
26
 
27
  #: events-calendar-widget.class.php:39
28
- #: views/events-list-load-widget-admin.php:2
29
  msgid "Title:"
30
  msgstr ""
31
 
@@ -33,11 +33,11 @@ msgstr ""
33
  msgid "A widget that displays the next upcoming x events."
34
  msgstr ""
35
 
36
- #: events-list-widget.class.php:81
37
  msgid "View All Events"
38
  msgstr ""
39
 
40
- #: events-list-widget.class.php:82
41
  msgid "There are no upcoming events at this time."
42
  msgstr ""
43
 
@@ -1057,161 +1057,169 @@ msgstr ""
1057
  msgid "Zimbabwe"
1058
  msgstr ""
1059
 
1060
- #: the-events-calendar.class.php:492
1061
  msgid "Jan"
1062
  msgstr ""
1063
 
1064
- #: the-events-calendar.class.php:493
1065
  msgid "Feb"
1066
  msgstr ""
1067
 
1068
- #: the-events-calendar.class.php:494
1069
  msgid "Mar"
1070
  msgstr ""
1071
 
1072
- #: the-events-calendar.class.php:495
1073
  msgid "Apr"
1074
  msgstr ""
1075
 
1076
- #: the-events-calendar.class.php:496 the-events-calendar.class.php:510
1077
  msgid "May"
1078
  msgstr ""
1079
 
1080
- #: the-events-calendar.class.php:497
1081
  msgid "Jun"
1082
  msgstr ""
1083
 
1084
- #: the-events-calendar.class.php:498
1085
  msgid "Jul"
1086
  msgstr ""
1087
 
1088
- #: the-events-calendar.class.php:499
1089
  msgid "Aug"
1090
  msgstr ""
1091
 
1092
- #: the-events-calendar.class.php:500
1093
  msgid "Sep"
1094
  msgstr ""
1095
 
1096
- #: the-events-calendar.class.php:501
1097
  msgid "Oct"
1098
  msgstr ""
1099
 
1100
- #: the-events-calendar.class.php:502
1101
  msgid "Nov"
1102
  msgstr ""
1103
 
1104
- #: the-events-calendar.class.php:503
1105
  msgid "Dec"
1106
  msgstr ""
1107
 
1108
- #: the-events-calendar.class.php:506
1109
  msgid "January"
1110
  msgstr ""
1111
 
1112
- #: the-events-calendar.class.php:507
1113
  msgid "February"
1114
  msgstr ""
1115
 
1116
- #: the-events-calendar.class.php:508
1117
  msgid "March"
1118
  msgstr ""
1119
 
1120
- #: the-events-calendar.class.php:509
1121
  msgid "April"
1122
  msgstr ""
1123
 
1124
- #: the-events-calendar.class.php:511
1125
  msgid "June"
1126
  msgstr ""
1127
 
1128
- #: the-events-calendar.class.php:512
1129
  msgid "July"
1130
  msgstr ""
1131
 
1132
- #: the-events-calendar.class.php:513
1133
  msgid "August"
1134
  msgstr ""
1135
 
1136
- #: the-events-calendar.class.php:514
1137
  msgid "September"
1138
  msgstr ""
1139
 
1140
- #: the-events-calendar.class.php:515
1141
  msgid "October"
1142
  msgstr ""
1143
 
1144
- #: the-events-calendar.class.php:516
1145
  msgid "November"
1146
  msgstr ""
1147
 
1148
- #: the-events-calendar.class.php:517
1149
  msgid "December"
1150
  msgstr ""
1151
 
1152
- #. #-#-#-#-# plugin.pot (The Events Calendar 1.6) #-#-#-#-#
1153
  #. Plugin Name of the plugin/theme
1154
- #: the-events-calendar.class.php:1009
1155
  msgid "The Events Calendar"
1156
  msgstr ""
1157
 
1158
- #: views/events-list-load-widget-admin.php:7
1159
  msgid "Show:"
1160
  msgstr ""
1161
 
1162
- #: views/events-list-load-widget-admin.php:15
1163
  msgid "Don't show the widget if there are no upcoming events:"
1164
  msgstr ""
1165
 
1166
- #: views/events-list-load-widget-admin.php:21
1167
  msgid "Display:"
1168
  msgstr ""
1169
 
1170
- #: views/events-list-load-widget-admin.php:24
1171
- msgid "Start Date & Time"
 
 
 
 
 
 
 
 
1172
  msgstr ""
1173
 
1174
- #: views/events-list-load-widget-admin.php:25
1175
- msgid "End Date & Time"
1176
  msgstr ""
1177
 
1178
- #: views/events-list-load-widget-admin.php:26
1179
  msgid "Venue"
1180
  msgstr ""
1181
 
1182
- #: views/events-list-load-widget-admin.php:27
1183
  msgid "Address"
1184
  msgstr ""
1185
 
1186
- #: views/events-list-load-widget-admin.php:28
1187
  msgid "City"
1188
  msgstr ""
1189
 
1190
- #: views/events-list-load-widget-admin.php:29
1191
  msgid "State (US)"
1192
  msgstr ""
1193
 
1194
- #: views/events-list-load-widget-admin.php:30
1195
  msgid "Province (Int)"
1196
  msgstr ""
1197
 
1198
- #: views/events-list-load-widget-admin.php:31
1199
  msgid "Postal Code"
1200
  msgstr ""
1201
 
1202
- #: views/events-list-load-widget-admin.php:32
1203
  msgid "Country"
1204
  msgstr ""
1205
 
1206
- #: views/events-list-load-widget-admin.php:33 views/events-meta-box.php:136
1207
  msgid "Phone"
1208
  msgstr ""
1209
 
1210
- #: views/events-list-load-widget-admin.php:34
1211
  msgid "Price"
1212
  msgstr ""
1213
 
1214
- #: views/events-list-load-widget-display.php:47
1215
  msgid "More Info"
1216
  msgstr ""
1217
 
@@ -1231,11 +1239,11 @@ msgstr ""
1231
  msgid "Is this post an event?"
1232
  msgstr ""
1233
 
1234
- #: views/events-meta-box.php:211 views/events-options.php:181
1235
  msgid "Yes"
1236
  msgstr ""
1237
 
1238
- #: views/events-meta-box.php:212 views/events-options.php:185
1239
  msgid "No"
1240
  msgstr ""
1241
 
@@ -1263,7 +1271,7 @@ msgstr ""
1263
  msgid "Event Location Details"
1264
  msgstr ""
1265
 
1266
- #: views/events-meta-box.php:299 views/list.php:45 views/single.php:27
1267
  msgid "Venue:"
1268
  msgstr ""
1269
 
@@ -1271,7 +1279,7 @@ msgstr ""
1271
  msgid "Country:"
1272
  msgstr ""
1273
 
1274
- #: views/events-meta-box.php:341 views/list.php:60 views/single.php:36
1275
  msgid "Address:"
1276
  msgstr ""
1277
 
@@ -1499,31 +1507,31 @@ msgstr ""
1499
  msgid "Show Google Map Link:"
1500
  msgstr ""
1501
 
1502
- #: views/events-meta-box.php:439
1503
  msgid "Show Google Map:"
1504
  msgstr ""
1505
 
1506
- #: views/events-meta-box.php:444 views/list.php:54 views/single.php:31
1507
  msgid "Phone:"
1508
  msgstr ""
1509
 
1510
- #: views/events-meta-box.php:448
1511
  msgid "Event Cost"
1512
  msgstr ""
1513
 
1514
- #: views/events-meta-box.php:451 views/list.php:72 views/single.php:21
1515
  msgid "Cost:"
1516
  msgstr ""
1517
 
1518
- #: views/events-meta-box.php:456
1519
  msgid "Leave blank to hide the field. Enter a 0 for events that are free."
1520
  msgstr ""
1521
 
1522
- #: views/events-meta-box.php:460
1523
  msgid "Sell Tickets &amp; Track Registration"
1524
  msgstr ""
1525
 
1526
- #: views/events-meta-box.php:465
1527
  msgid ""
1528
  "Interested in selling tickets and tracking registrations? Now you can do it "
1529
  "for free using our <a href=\"http://wordpress.org/extend/plugins/eventbrite-"
@@ -1535,11 +1543,11 @@ msgid ""
1535
  "building plugins for the open source community. "
1536
  msgstr ""
1537
 
1538
- #: views/events-meta-box.php:465
1539
  msgid "Check it out here."
1540
  msgstr ""
1541
 
1542
- #: views/events-meta-box.php:483
1543
  msgid ""
1544
  "<h4>If You Like This Plugin - Help Support It</h4><p>We spend a lot of time "
1545
  "and effort building robust plugins and we love to share them with the "
@@ -1549,7 +1557,7 @@ msgid ""
1549
  "p>"
1550
  msgstr ""
1551
 
1552
- #: views/events-meta-box.php:485
1553
  msgid "Thanks"
1554
  msgstr ""
1555
 
@@ -1575,99 +1583,105 @@ msgstr ""
1575
  msgid "Here is the iCal feed URL for your events: "
1576
  msgstr ""
1577
 
1578
- #: views/events-options.php:99
 
 
 
 
 
 
1579
  msgid "Donate"
1580
  msgstr ""
1581
 
1582
- #: views/events-options.php:108
1583
  msgid ""
1584
  "If you find this plugin useful, please consider donating to the producer of "
1585
  "it, Shane &#38; Peter, Inc. Thank you!"
1586
  msgstr ""
1587
 
1588
- #: views/events-options.php:112
1589
  msgid "I have already donated, so please hide this button!"
1590
  msgstr ""
1591
 
1592
- #: views/events-options.php:122
1593
  msgid "Donate for this wonderful plugin"
1594
  msgstr ""
1595
 
1596
- #: views/events-options.php:136
1597
  msgid "Settings"
1598
  msgstr ""
1599
 
1600
- #: views/events-options.php:139 views/events-options.php:143
1601
  msgid "Default View for the Events"
1602
  msgstr ""
1603
 
1604
- #: views/events-options.php:155 views/gridview.php:28 views/list.php:12
1605
  msgid "Calendar"
1606
  msgstr ""
1607
 
1608
- #: views/events-options.php:159 views/gridview.php:27 views/list.php:11
1609
  msgid "Event List"
1610
  msgstr ""
1611
 
1612
- #: views/events-options.php:165 views/events-options.php:169
1613
  msgid "Show Comments"
1614
  msgstr ""
1615
 
1616
- #: views/events-options.php:191
1617
  msgid "Default Country for Events"
1618
  msgstr ""
1619
 
1620
- #: views/events-options.php:214 views/events-options.php:218
1621
  msgid "Display Events on Homepage"
1622
  msgstr ""
1623
 
1624
- #: views/events-options.php:225 views/events-options.php:254
1625
- #: views/events-options.php:281 views/events-options.php:307
1626
  msgid "Off"
1627
  msgstr ""
1628
 
1629
- #: views/events-options.php:229 views/events-options.php:258
1630
- #: views/events-options.php:285 views/events-options.php:311
1631
  msgid "On"
1632
  msgstr ""
1633
 
1634
- #: views/events-options.php:236 views/events-options.php:240
1635
  msgid "Embed Google Maps"
1636
  msgstr ""
1637
 
1638
- #: views/events-options.php:261
1639
  msgid "Height"
1640
  msgstr ""
1641
 
1642
- #: views/events-options.php:262
1643
  msgid "Width"
1644
  msgstr ""
1645
 
1646
- #: views/events-options.php:262
1647
  msgid "(number or %)"
1648
  msgstr ""
1649
 
1650
- #: views/events-options.php:270 views/events-options.php:274
1651
  msgid "Feature on Event Date"
1652
  msgstr ""
1653
 
1654
- #: views/events-options.php:288
1655
  msgid ""
1656
  "This option will bump an event to the top of the homepage loop on the day of "
1657
  "the event."
1658
  msgstr ""
1659
 
1660
- #: views/events-options.php:296 views/events-options.php:300
1661
  msgid "Use Pretty URLs"
1662
  msgstr ""
1663
 
1664
- #: views/events-options.php:314
1665
  msgid ""
1666
  "Pretty URLs (ie, http://site/category/events/upcoming) may interfere with "
1667
  "custom themes or plugins."
1668
  msgstr ""
1669
 
1670
- #: views/events-options.php:340
1671
  msgid "Save Changes"
1672
  msgstr ""
1673
 
@@ -1675,27 +1689,27 @@ msgstr ""
1675
  msgid "Calendar of Events"
1676
  msgstr ""
1677
 
1678
- #: views/gridview.php:31 views/list.php:16
1679
  msgid "iCal Import"
1680
  msgstr ""
1681
 
1682
- #: views/list.php:33 views/single.php:14
1683
  msgid "Start:"
1684
  msgstr ""
1685
 
1686
- #: views/list.php:37 views/single.php:17
1687
  msgid "End:"
1688
  msgstr ""
1689
 
1690
- #: views/list.php:62 views/single.php:38
1691
  msgid "Google Map"
1692
  msgstr ""
1693
 
1694
- #: views/list.php:94
1695
  msgid "&laquo; Previous Events"
1696
  msgstr ""
1697
 
1698
- #: views/list.php:107
1699
  msgid "Next Events &raquo;"
1700
  msgstr ""
1701
 
@@ -1703,11 +1717,11 @@ msgstr ""
1703
  msgid "&laquo; Back to Events"
1704
  msgstr ""
1705
 
1706
- #: views/single.php:11
1707
  msgid "This event has passed."
1708
  msgstr ""
1709
 
1710
- #: views/single.php:38
1711
  msgid "Click to view a Google Map"
1712
  msgstr ""
1713
 
1
+ # Translation of the WordPress plugin The Events Calendar 1.6.3 by Shane & Peter, Inc..
2
  # Copyright (C) 2010 Shane & Peter, Inc.
3
  # This file is distributed under the same license as the The Events Calendar package.
4
  # FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
6
  #, fuzzy
7
  msgid ""
8
  msgstr ""
9
+ "Project-Id-Version: The Events Calendar 1.6.3\n"
10
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/the-events-calendar\n"
11
+ "POT-Creation-Date: 2010-06-18 15:34+0000\n"
12
  "PO-Revision-Date: 2010-MO-DA HO:MI+ZONE\n"
13
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
  "Language-Team: LANGUAGE <LL@li.org>\n"
25
  msgstr ""
26
 
27
  #: events-calendar-widget.class.php:39
28
+ #: views/events-list-load-widget-admin.php:27
29
  msgid "Title:"
30
  msgstr ""
31
 
33
  msgid "A widget that displays the next upcoming x events."
34
  msgstr ""
35
 
36
+ #: events-list-widget.class.php:80
37
  msgid "View All Events"
38
  msgstr ""
39
 
40
+ #: events-list-widget.class.php:81
41
  msgid "There are no upcoming events at this time."
42
  msgstr ""
43
 
1057
  msgid "Zimbabwe"
1058
  msgstr ""
1059
 
1060
+ #: the-events-calendar.class.php:516
1061
  msgid "Jan"
1062
  msgstr ""
1063
 
1064
+ #: the-events-calendar.class.php:517
1065
  msgid "Feb"
1066
  msgstr ""
1067
 
1068
+ #: the-events-calendar.class.php:518
1069
  msgid "Mar"
1070
  msgstr ""
1071
 
1072
+ #: the-events-calendar.class.php:519
1073
  msgid "Apr"
1074
  msgstr ""
1075
 
1076
+ #: the-events-calendar.class.php:520 the-events-calendar.class.php:534
1077
  msgid "May"
1078
  msgstr ""
1079
 
1080
+ #: the-events-calendar.class.php:521
1081
  msgid "Jun"
1082
  msgstr ""
1083
 
1084
+ #: the-events-calendar.class.php:522
1085
  msgid "Jul"
1086
  msgstr ""
1087
 
1088
+ #: the-events-calendar.class.php:523
1089
  msgid "Aug"
1090
  msgstr ""
1091
 
1092
+ #: the-events-calendar.class.php:524
1093
  msgid "Sep"
1094
  msgstr ""
1095
 
1096
+ #: the-events-calendar.class.php:525
1097
  msgid "Oct"
1098
  msgstr ""
1099
 
1100
+ #: the-events-calendar.class.php:526
1101
  msgid "Nov"
1102
  msgstr ""
1103
 
1104
+ #: the-events-calendar.class.php:527
1105
  msgid "Dec"
1106
  msgstr ""
1107
 
1108
+ #: the-events-calendar.class.php:530
1109
  msgid "January"
1110
  msgstr ""
1111
 
1112
+ #: the-events-calendar.class.php:531
1113
  msgid "February"
1114
  msgstr ""
1115
 
1116
+ #: the-events-calendar.class.php:532
1117
  msgid "March"
1118
  msgstr ""
1119
 
1120
+ #: the-events-calendar.class.php:533
1121
  msgid "April"
1122
  msgstr ""
1123
 
1124
+ #: the-events-calendar.class.php:535
1125
  msgid "June"
1126
  msgstr ""
1127
 
1128
+ #: the-events-calendar.class.php:536
1129
  msgid "July"
1130
  msgstr ""
1131
 
1132
+ #: the-events-calendar.class.php:537
1133
  msgid "August"
1134
  msgstr ""
1135
 
1136
+ #: the-events-calendar.class.php:538
1137
  msgid "September"
1138
  msgstr ""
1139
 
1140
+ #: the-events-calendar.class.php:539
1141
  msgid "October"
1142
  msgstr ""
1143
 
1144
+ #: the-events-calendar.class.php:540
1145
  msgid "November"
1146
  msgstr ""
1147
 
1148
+ #: the-events-calendar.class.php:541
1149
  msgid "December"
1150
  msgstr ""
1151
 
1152
+ #. #-#-#-#-# plugin.pot (The Events Calendar 1.6.3) #-#-#-#-#
1153
  #. Plugin Name of the plugin/theme
1154
+ #: the-events-calendar.class.php:1047
1155
  msgid "The Events Calendar"
1156
  msgstr ""
1157
 
1158
+ #: views/events-list-load-widget-admin.php:32
1159
  msgid "Show:"
1160
  msgstr ""
1161
 
1162
+ #: views/events-list-load-widget-admin.php:40
1163
  msgid "Don't show the widget if there are no upcoming events:"
1164
  msgstr ""
1165
 
1166
+ #: views/events-list-load-widget-admin.php:46
1167
  msgid "Display:"
1168
  msgstr ""
1169
 
1170
+ #: views/events-list-load-widget-admin.php:49
1171
+ msgid "Start Date"
1172
+ msgstr ""
1173
+
1174
+ #: views/events-list-load-widget-admin.php:50
1175
+ msgid "Start Time"
1176
+ msgstr ""
1177
+
1178
+ #: views/events-list-load-widget-admin.php:51
1179
+ msgid "End Date"
1180
  msgstr ""
1181
 
1182
+ #: views/events-list-load-widget-admin.php:52
1183
+ msgid "End Time"
1184
  msgstr ""
1185
 
1186
+ #: views/events-list-load-widget-admin.php:53
1187
  msgid "Venue"
1188
  msgstr ""
1189
 
1190
+ #: views/events-list-load-widget-admin.php:54
1191
  msgid "Address"
1192
  msgstr ""
1193
 
1194
+ #: views/events-list-load-widget-admin.php:55
1195
  msgid "City"
1196
  msgstr ""
1197
 
1198
+ #: views/events-list-load-widget-admin.php:56
1199
  msgid "State (US)"
1200
  msgstr ""
1201
 
1202
+ #: views/events-list-load-widget-admin.php:57
1203
  msgid "Province (Int)"
1204
  msgstr ""
1205
 
1206
+ #: views/events-list-load-widget-admin.php:58
1207
  msgid "Postal Code"
1208
  msgstr ""
1209
 
1210
+ #: views/events-list-load-widget-admin.php:59
1211
  msgid "Country"
1212
  msgstr ""
1213
 
1214
+ #: views/events-list-load-widget-admin.php:60 views/events-meta-box.php:136
1215
  msgid "Phone"
1216
  msgstr ""
1217
 
1218
+ #: views/events-list-load-widget-admin.php:61
1219
  msgid "Price"
1220
  msgstr ""
1221
 
1222
+ #: views/events-list-load-widget-display.php:72
1223
  msgid "More Info"
1224
  msgstr ""
1225
 
1239
  msgid "Is this post an event?"
1240
  msgstr ""
1241
 
1242
+ #: views/events-meta-box.php:211 views/events-options.php:182
1243
  msgid "Yes"
1244
  msgstr ""
1245
 
1246
+ #: views/events-meta-box.php:212 views/events-options.php:186
1247
  msgid "No"
1248
  msgstr ""
1249
 
1271
  msgid "Event Location Details"
1272
  msgstr ""
1273
 
1274
+ #: views/events-meta-box.php:299 views/list.php:49 views/single.php:28
1275
  msgid "Venue:"
1276
  msgstr ""
1277
 
1279
  msgid "Country:"
1280
  msgstr ""
1281
 
1282
+ #: views/events-meta-box.php:341 views/list.php:64 views/single.php:37
1283
  msgid "Address:"
1284
  msgstr ""
1285
 
1507
  msgid "Show Google Map Link:"
1508
  msgstr ""
1509
 
1510
+ #: views/events-meta-box.php:434
1511
  msgid "Show Google Map:"
1512
  msgstr ""
1513
 
1514
+ #: views/events-meta-box.php:439 views/list.php:58 views/single.php:32
1515
  msgid "Phone:"
1516
  msgstr ""
1517
 
1518
+ #: views/events-meta-box.php:443
1519
  msgid "Event Cost"
1520
  msgstr ""
1521
 
1522
+ #: views/events-meta-box.php:446 views/list.php:77 views/single.php:22
1523
  msgid "Cost:"
1524
  msgstr ""
1525
 
1526
+ #: views/events-meta-box.php:451
1527
  msgid "Leave blank to hide the field. Enter a 0 for events that are free."
1528
  msgstr ""
1529
 
1530
+ #: views/events-meta-box.php:455
1531
  msgid "Sell Tickets &amp; Track Registration"
1532
  msgstr ""
1533
 
1534
+ #: views/events-meta-box.php:460
1535
  msgid ""
1536
  "Interested in selling tickets and tracking registrations? Now you can do it "
1537
  "for free using our <a href=\"http://wordpress.org/extend/plugins/eventbrite-"
1543
  "building plugins for the open source community. "
1544
  msgstr ""
1545
 
1546
+ #: views/events-meta-box.php:460
1547
  msgid "Check it out here."
1548
  msgstr ""
1549
 
1550
+ #: views/events-meta-box.php:476
1551
  msgid ""
1552
  "<h4>If You Like This Plugin - Help Support It</h4><p>We spend a lot of time "
1553
  "and effort building robust plugins and we love to share them with the "
1557
  "p>"
1558
  msgstr ""
1559
 
1560
+ #: views/events-meta-box.php:478
1561
  msgid "Thanks"
1562
  msgstr ""
1563
 
1583
  msgid "Here is the iCal feed URL for your events: "
1584
  msgstr ""
1585
 
1586
+ #: views/events-options.php:97
1587
+ msgid ""
1588
+ "The iCal feed can be sorted by sub-category. Add the category slug to the "
1589
+ "above URL: "
1590
+ msgstr ""
1591
+
1592
+ #: views/events-options.php:100
1593
  msgid "Donate"
1594
  msgstr ""
1595
 
1596
+ #: views/events-options.php:109
1597
  msgid ""
1598
  "If you find this plugin useful, please consider donating to the producer of "
1599
  "it, Shane &#38; Peter, Inc. Thank you!"
1600
  msgstr ""
1601
 
1602
+ #: views/events-options.php:113
1603
  msgid "I have already donated, so please hide this button!"
1604
  msgstr ""
1605
 
1606
+ #: views/events-options.php:123
1607
  msgid "Donate for this wonderful plugin"
1608
  msgstr ""
1609
 
1610
+ #: views/events-options.php:137
1611
  msgid "Settings"
1612
  msgstr ""
1613
 
1614
+ #: views/events-options.php:140 views/events-options.php:144
1615
  msgid "Default View for the Events"
1616
  msgstr ""
1617
 
1618
+ #: views/events-options.php:156 views/gridview.php:28 views/list.php:12
1619
  msgid "Calendar"
1620
  msgstr ""
1621
 
1622
+ #: views/events-options.php:160 views/gridview.php:27 views/list.php:11
1623
  msgid "Event List"
1624
  msgstr ""
1625
 
1626
+ #: views/events-options.php:166 views/events-options.php:170
1627
  msgid "Show Comments"
1628
  msgstr ""
1629
 
1630
+ #: views/events-options.php:192
1631
  msgid "Default Country for Events"
1632
  msgstr ""
1633
 
1634
+ #: views/events-options.php:215 views/events-options.php:219
1635
  msgid "Display Events on Homepage"
1636
  msgstr ""
1637
 
1638
+ #: views/events-options.php:226 views/events-options.php:255
1639
+ #: views/events-options.php:282 views/events-options.php:308
1640
  msgid "Off"
1641
  msgstr ""
1642
 
1643
+ #: views/events-options.php:230 views/events-options.php:259
1644
+ #: views/events-options.php:286 views/events-options.php:312
1645
  msgid "On"
1646
  msgstr ""
1647
 
1648
+ #: views/events-options.php:237 views/events-options.php:241
1649
  msgid "Embed Google Maps"
1650
  msgstr ""
1651
 
1652
+ #: views/events-options.php:262
1653
  msgid "Height"
1654
  msgstr ""
1655
 
1656
+ #: views/events-options.php:263
1657
  msgid "Width"
1658
  msgstr ""
1659
 
1660
+ #: views/events-options.php:263
1661
  msgid "(number or %)"
1662
  msgstr ""
1663
 
1664
+ #: views/events-options.php:271 views/events-options.php:275
1665
  msgid "Feature on Event Date"
1666
  msgstr ""
1667
 
1668
+ #: views/events-options.php:289
1669
  msgid ""
1670
  "This option will bump an event to the top of the homepage loop on the day of "
1671
  "the event."
1672
  msgstr ""
1673
 
1674
+ #: views/events-options.php:297 views/events-options.php:301
1675
  msgid "Use Pretty URLs"
1676
  msgstr ""
1677
 
1678
+ #: views/events-options.php:315
1679
  msgid ""
1680
  "Pretty URLs (ie, http://site/category/events/upcoming) may interfere with "
1681
  "custom themes or plugins."
1682
  msgstr ""
1683
 
1684
+ #: views/events-options.php:341
1685
  msgid "Save Changes"
1686
  msgstr ""
1687
 
1689
  msgid "Calendar of Events"
1690
  msgstr ""
1691
 
1692
+ #: views/gridview.php:35 views/list.php:20 views/single.php:11
1693
  msgid "iCal Import"
1694
  msgstr ""
1695
 
1696
+ #: views/list.php:37 views/single.php:15
1697
  msgid "Start:"
1698
  msgstr ""
1699
 
1700
+ #: views/list.php:41 views/single.php:18
1701
  msgid "End:"
1702
  msgstr ""
1703
 
1704
+ #: views/list.php:67 views/single.php:40
1705
  msgid "Google Map"
1706
  msgstr ""
1707
 
1708
+ #: views/list.php:99
1709
  msgid "&laquo; Previous Events"
1710
  msgstr ""
1711
 
1712
+ #: views/list.php:112
1713
  msgid "Next Events &raquo;"
1714
  msgstr ""
1715
 
1717
  msgid "&laquo; Back to Events"
1718
  msgstr ""
1719
 
1720
+ #: views/single.php:12
1721
  msgid "This event has passed."
1722
  msgstr ""
1723
 
1724
+ #: views/single.php:40
1725
  msgid "Click to view a Google Map"
1726
  msgstr ""
1727
 
readme.txt CHANGED
@@ -4,8 +4,8 @@ Contributors: Kelsey Damas, Matt Wiebe, Justin Endler, Reid Peifer, Dan Cameron,
4
  Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=10750983
5
  Tags: widget, events, simple, tooltips, grid, month, list, calendar, event, venue, eventbrite, registration, tickets, ticketing, eventbright, api, dates, date, plugin, posts, sidebar, template, theme, time, google maps, conference, workshop, concert, meeting, seminar, summit, forum, shortcode
6
  Requires at least: 2.8
7
- Tested up to: 3.0
8
- Stable tag: 1.6.2
9
 
10
  == Description ==
11
 
@@ -143,8 +143,8 @@ Time format comes from:
143
 
144
  These functions will return the metadata associated with the event. The ID is optional.
145
 
146
- **event_google_map_link( $id )**
147
- **get_event_google_map_link( $id )**
148
 
149
  Echos or returns, respectively, an http:// link to google maps for the event's address. The ID is optional.
150
 
@@ -211,6 +211,21 @@ Please visit the forum for questions or comments: http://wordpress.org/tags/the-
211
 
212
  == Changelog ==
213
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
214
  = 1.6.1 =
215
 
216
  Features
4
  Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=10750983
5
  Tags: widget, events, simple, tooltips, grid, month, list, calendar, event, venue, eventbrite, registration, tickets, ticketing, eventbright, api, dates, date, plugin, posts, sidebar, template, theme, time, google maps, conference, workshop, concert, meeting, seminar, summit, forum, shortcode
6
  Requires at least: 2.8
7
+ Tested up to: 3.1 alpha
8
+ Stable tag: 1.6.3
9
 
10
  == Description ==
11
 
143
 
144
  These functions will return the metadata associated with the event. The ID is optional.
145
 
146
+ **event_google_map_link( $id, $extraArgs, $location )**
147
+ **get_event_google_map_link( $id, $extraArgs, $location )**
148
 
149
  Echos or returns, respectively, an http:// link to google maps for the event's address. The ID is optional.
150
 
211
 
212
  == Changelog ==
213
 
214
+ = 1.6.3 =
215
+
216
+ Features
217
+
218
+ * iCal import sorted options: post, category, all
219
+
220
+ Bugs
221
+
222
+ * List Widget: eliminate empty li tags when there are no upcoming events (thanks to tokidoki2005)
223
+ * prev / next month links in grid view remain in subcategory of Events
224
+ * remove calls to non-existent images
225
+ * List Widget now follows display choices made in admin
226
+ * gmap display choices persistent across plugin updates
227
+ * better field validation when collecting post meta about events
228
+
229
  = 1.6.1 =
230
 
231
  Features
resources/events.css CHANGED
@@ -105,7 +105,6 @@ table.tec-calendar {
105
  .tec-calendar th {
106
  width: 250px;
107
  height: 10px;
108
- background: #999 url(images/grid-th-bg.png) repeat-x;
109
  color: #fff;
110
  padding:4px 0;
111
  text-shadow:1px 1px 0 rgba(0,0,0,.5);
@@ -162,9 +161,9 @@ table.tec-calendar {
162
  right:30px;
163
  }
164
  .tec-tooltip .tec-event-title {
 
165
  margin:0;
166
  color:#fff;
167
- background:#418ccf url(images/tooltip-title.png) repeat-x;
168
  font-size:12px;
169
  padding:0 6px;
170
  height:24px;
105
  .tec-calendar th {
106
  width: 250px;
107
  height: 10px;
 
108
  color: #fff;
109
  padding:4px 0;
110
  text-shadow:1px 1px 0 rgba(0,0,0,.5);
161
  right:30px;
162
  }
163
  .tec-tooltip .tec-event-title {
164
+ background-color: #3F7DBD;
165
  margin:0;
166
  color:#fff;
 
167
  font-size:12px;
168
  padding:0 6px;
169
  height:24px;
template-tags.php CHANGED
@@ -1,5 +1,4 @@
1
  <?php
2
-
3
  if( class_exists( 'The_Events_Calendar' ) && !function_exists( 'eventsGetOptionValue' ) ) {
4
  // fetch the iCal file
5
  if ( isset($_GET['ical']) ) add_action('init', array( $spEvents, 'iCalFeed') );
@@ -95,21 +94,33 @@ if( class_exists( 'The_Events_Calendar' ) && !function_exists( 'eventsGetOptionV
95
  * Returns a link to google maps for the given event
96
  *
97
  * @param string $postId
 
 
98
  * @return string a fully qualified link to http://maps.google.com/ for this event
99
  */
100
- function get_event_google_map_link( $postId = null ) {
101
  if ( $postId === null || !is_numeric( $postId ) ) {
102
  global $post;
103
  $postId = $post->ID;
104
  }
 
105
  if ( !is_event( $postId ) ) return false;
106
  $locationMetaSuffixes = array( 'Address', 'City', 'State', 'Province', 'Zip', 'Country' );
107
- $toUrlEncode = "";
108
- foreach( $locationMetaSuffixes as $val ) {
109
- $metaVal = get_post_meta( $postId, '_Event' . $val, true );
110
- if( $metaVal ) $toUrlEncode .= $metaVal . " ";
 
 
 
 
 
 
 
 
 
 
111
  }
112
- if( $toUrlEncode ) return "http://maps.google.com/maps?f=q&amp;source=s_q&amp;hl=en&amp;geocode=&amp;q=" . urlencode( trim( $toUrlEncode ) );
113
  return "";
114
  }
115
  /**
@@ -118,8 +129,8 @@ if( class_exists( 'The_Events_Calendar' ) && !function_exists( 'eventsGetOptionV
118
  * @param string $postId
119
  * @return void
120
  */
121
- function event_google_map_link( $postId = null ) {
122
- echo get_event_google_map_link( $postId );
123
  }
124
  /**
125
  * @return string formatted event address
@@ -573,10 +584,9 @@ if( class_exists( 'The_Events_Calendar' ) && !function_exists( 'eventsGetOptionV
573
  */
574
  function events_get_past_link() {
575
  global $spEvents;
576
- $cat_id = get_query_var( 'cat' );
577
- if( !$cat_id ) {
578
- $cat_id = $spEvents->eventCategory();
579
- }
580
  $link = get_category_link( $cat_id );
581
  if( '' == get_option('permalink_structure') || 'off' == eventsGetOptionValue('useRewriteRules','on') ) {
582
  return add_query_arg( array('eventDisplay'=>'past'), $link );
@@ -591,10 +601,9 @@ if( class_exists( 'The_Events_Calendar' ) && !function_exists( 'eventsGetOptionV
591
  */
592
  function events_get_upcoming_link() {
593
  global $spEvents;
594
- $cat_id = get_query_var( 'cat' );
595
- if( !$cat_id ) {
596
- $cat_id = $spEvents->eventCategory();
597
- }
598
  $link = get_category_link( $cat_id );
599
  if( '' == get_option('permalink_structure') || 'off' == eventsGetOptionValue('useRewriteRules','on') ) {
600
  return add_query_arg( array('eventDisplay'=>'upcoming'), $link );
@@ -609,13 +618,14 @@ if( class_exists( 'The_Events_Calendar' ) && !function_exists( 'eventsGetOptionV
609
  */
610
  function events_get_next_month_link() {
611
  global $spEvents;
612
- $cat_id = get_query_var( 'cat' );
613
- if( !$cat_id ) {
614
- $cat_id = $spEvents->eventCategory();
615
- }
616
  $link = get_category_link( $cat_id );
617
  if( '' == get_option('permalink_structure') || 'off' == eventsGetOptionValue('useRewriteRules','on') ) {
618
- return add_query_arg( array('eventDate'=>$spEvents->nextMonth( $spEvents->date )), $link );
 
 
619
  } else {
620
  return trailingslashit( $link ) . $spEvents->nextMonth( $spEvents->date );
621
  }
@@ -627,13 +637,15 @@ if( class_exists( 'The_Events_Calendar' ) && !function_exists( 'eventsGetOptionV
627
  */
628
  function events_get_previous_month_link() {
629
  global $spEvents;
630
- $cat_id = get_query_var( 'cat' );
631
- if( !$cat_id ) {
632
- $cat_id = $spEvents->eventCategory();
633
- }
634
  $link = get_category_link( $cat_id );
635
  if( '' == get_option('permalink_structure') || 'off' == eventsGetOptionValue('useRewriteRules','on') ) {
636
- return add_query_arg( array('eventDate'=>$spEvents->previousMonth( $spEvents->date )), $link );
 
 
 
637
  } else {
638
  return trailingslashit( $link ) . $spEvents->previousMonth( $spEvents->date );
639
  }
@@ -645,19 +657,17 @@ if( class_exists( 'The_Events_Calendar' ) && !function_exists( 'eventsGetOptionV
645
  */
646
  function events_get_events_link() {
647
  global $spEvents;
648
- $cat_id = get_query_var( 'cat' );
649
- if( !$cat_id ) {
650
- $cat_id = $spEvents->eventCategory();
651
- }
652
  return get_category_link( $cat_id );
653
  }
654
 
655
  function events_get_gridview_link( ) {
656
  global $spEvents;
657
- $cat_id = get_query_var( 'cat' );
658
- if( !$cat_id ) {
659
- $cat_id = $spEvents->eventCategory();
660
- }
661
  $link = get_category_link( $cat_id );
662
  if( '' == get_option('permalink_structure') || 'off' == eventsGetOptionValue('useRewriteRules','on') ) {
663
  return add_query_arg( array('eventDisplay'=>'month'), $link );
@@ -668,10 +678,9 @@ if( class_exists( 'The_Events_Calendar' ) && !function_exists( 'eventsGetOptionV
668
 
669
  function events_get_listview_link( ) {
670
  global $spEvents;
671
- $cat_id = get_query_var( 'cat' );
672
- if( !$cat_id ) {
673
- $cat_id = $spEvents->eventCategory();
674
- }
675
  $link = get_category_link( $cat_id );
676
  if( '' == get_option('permalink_structure') || 'off' == eventsGetOptionValue('useRewriteRules','on') ) {
677
  return add_query_arg( array('eventDisplay'=>'upcoming'), $link );
@@ -682,10 +691,9 @@ if( class_exists( 'The_Events_Calendar' ) && !function_exists( 'eventsGetOptionV
682
 
683
  function events_get_listview_past_link( ) {
684
  global $spEvents;
685
- $cat_id = get_query_var( 'cat' );
686
- if( !$cat_id ) {
687
- $cat_id = $spEvents->eventCategory();
688
- }
689
  $link = get_category_link( $cat_id );
690
  if( '' == get_option('permalink_structure') || 'off' == eventsGetOptionValue('useRewriteRules','on') ) {
691
  return add_query_arg( array('eventDisplay'=>'past'), $link );
@@ -755,11 +763,15 @@ if( class_exists( 'The_Events_Calendar' ) && !function_exists( 'eventsGetOptionV
755
  *
756
  * @return string
757
  */
758
- function the_event_region() {
 
 
 
 
759
  if (get_post_meta($postId, '_EventCountry', true ) == 'United States') {
760
- return the_event_state();
761
  } else {
762
- return the_event_province();
763
  }
764
  }
765
  /**
1
  <?php
 
2
  if( class_exists( 'The_Events_Calendar' ) && !function_exists( 'eventsGetOptionValue' ) ) {
3
  // fetch the iCal file
4
  if ( isset($_GET['ical']) ) add_action('init', array( $spEvents, 'iCalFeed') );
94
  * Returns a link to google maps for the given event
95
  *
96
  * @param string $postId
97
+ * @param array multidimensional array of query string keys and values
98
+ * @param string location of the event
99
  * @return string a fully qualified link to http://maps.google.com/ for this event
100
  */
101
+ function get_event_google_map_link( $postId = null, $extraArgs = "", $location = "" ) {
102
  if ( $postId === null || !is_numeric( $postId ) ) {
103
  global $post;
104
  $postId = $post->ID;
105
  }
106
+ $output = "http://maps.google.com/maps?";
107
  if ( !is_event( $postId ) ) return false;
108
  $locationMetaSuffixes = array( 'Address', 'City', 'State', 'Province', 'Zip', 'Country' );
109
+ if( !$location ) {
110
+ foreach( $locationMetaSuffixes as $val ) {
111
+ $metaVal = get_post_meta( $postId, '_Event' . $val, true );
112
+ if( $metaVal ) $location .= $metaVal . " ";
113
+ }
114
+ }
115
+ if( is_array( $extraArgs ) ) {
116
+ foreach( $extraArgs as $key => $val ) {
117
+ $output .= "&amp;" . $key . "=" . $val;
118
+ }
119
+ }
120
+ if( $location ) {
121
+ $output .= "&amp;q=" . urlencode( trim( $location ) );
122
+ return $output;
123
  }
 
124
  return "";
125
  }
126
  /**
129
  * @param string $postId
130
  * @return void
131
  */
132
+ function event_google_map_link( $postId = null, $extraArgs = "", $location = "" ) {
133
+ echo get_event_google_map_link( $postId, $extraArgs, $location );
134
  }
135
  /**
136
  * @return string formatted event address
584
  */
585
  function events_get_past_link() {
586
  global $spEvents;
587
+ $mainEventsCat = $spEvents->eventCategory();
588
+ $currentCat = get_query_var( 'cat' );
589
+ $cat_id = cat_is_ancestor_of( $mainEventsCat, $currentCat ) ? $currentCat : $mainEventsCat;
 
590
  $link = get_category_link( $cat_id );
591
  if( '' == get_option('permalink_structure') || 'off' == eventsGetOptionValue('useRewriteRules','on') ) {
592
  return add_query_arg( array('eventDisplay'=>'past'), $link );
601
  */
602
  function events_get_upcoming_link() {
603
  global $spEvents;
604
+ $mainEventsCat = $spEvents->eventCategory();
605
+ $currentCat = get_query_var( 'cat' );
606
+ $cat_id = cat_is_ancestor_of( $mainEventsCat, $currentCat ) ? $currentCat : $mainEventsCat;
 
607
  $link = get_category_link( $cat_id );
608
  if( '' == get_option('permalink_structure') || 'off' == eventsGetOptionValue('useRewriteRules','on') ) {
609
  return add_query_arg( array('eventDisplay'=>'upcoming'), $link );
618
  */
619
  function events_get_next_month_link() {
620
  global $spEvents;
621
+ $mainEventsCat = $spEvents->eventCategory();
622
+ $currentCat = get_query_var( 'cat' );
623
+ $cat_id = cat_is_ancestor_of( $mainEventsCat, $currentCat ) ? $currentCat : $mainEventsCat;
 
624
  $link = get_category_link( $cat_id );
625
  if( '' == get_option('permalink_structure') || 'off' == eventsGetOptionValue('useRewriteRules','on') ) {
626
+ return add_query_arg( array('eventDate'=>$spEvents->nextMonth( $spEvents->date ),
627
+ 'eventDisplay'=>'month'
628
+ ), $link );
629
  } else {
630
  return trailingslashit( $link ) . $spEvents->nextMonth( $spEvents->date );
631
  }
637
  */
638
  function events_get_previous_month_link() {
639
  global $spEvents;
640
+ $mainEventsCat = $spEvents->eventCategory();
641
+ $currentCat = get_query_var( 'cat' );
642
+ $cat_id = cat_is_ancestor_of( $mainEventsCat, $currentCat ) ? $currentCat : $mainEventsCat;
 
643
  $link = get_category_link( $cat_id );
644
  if( '' == get_option('permalink_structure') || 'off' == eventsGetOptionValue('useRewriteRules','on') ) {
645
+ return add_query_arg( array(
646
+ 'eventDate'=>$spEvents->previousMonth( $spEvents->date ),
647
+ 'eventDisplay'=>'month'
648
+ ), $link );
649
  } else {
650
  return trailingslashit( $link ) . $spEvents->previousMonth( $spEvents->date );
651
  }
657
  */
658
  function events_get_events_link() {
659
  global $spEvents;
660
+ $mainEventsCat = $spEvents->eventCategory();
661
+ $currentCat = get_query_var( 'cat' );
662
+ $cat_id = cat_is_ancestor_of( $mainEventsCat, $currentCat ) ? $currentCat : $mainEventsCat;
 
663
  return get_category_link( $cat_id );
664
  }
665
 
666
  function events_get_gridview_link( ) {
667
  global $spEvents;
668
+ $mainEventsCat = $spEvents->eventCategory();
669
+ $currentCat = get_query_var( 'cat' );
670
+ $cat_id = cat_is_ancestor_of( $mainEventsCat, $currentCat ) ? $currentCat : $mainEventsCat;
 
671
  $link = get_category_link( $cat_id );
672
  if( '' == get_option('permalink_structure') || 'off' == eventsGetOptionValue('useRewriteRules','on') ) {
673
  return add_query_arg( array('eventDisplay'=>'month'), $link );
678
 
679
  function events_get_listview_link( ) {
680
  global $spEvents;
681
+ $mainEventsCat = $spEvents->eventCategory();
682
+ $currentCat = get_query_var( 'cat' );
683
+ $cat_id = cat_is_ancestor_of( $mainEventsCat, $currentCat ) ? $currentCat : $mainEventsCat;
 
684
  $link = get_category_link( $cat_id );
685
  if( '' == get_option('permalink_structure') || 'off' == eventsGetOptionValue('useRewriteRules','on') ) {
686
  return add_query_arg( array('eventDisplay'=>'upcoming'), $link );
691
 
692
  function events_get_listview_past_link( ) {
693
  global $spEvents;
694
+ $mainEventsCat = $spEvents->eventCategory();
695
+ $currentCat = get_query_var( 'cat' );
696
+ $cat_id = cat_is_ancestor_of( $mainEventsCat, $currentCat ) ? $currentCat : $mainEventsCat;
 
697
  $link = get_category_link( $cat_id );
698
  if( '' == get_option('permalink_structure') || 'off' == eventsGetOptionValue('useRewriteRules','on') ) {
699
  return add_query_arg( array('eventDisplay'=>'past'), $link );
763
  *
764
  * @return string
765
  */
766
+ function the_event_region( $postId = null ) {
767
+ if ( $postId === null || !is_numeric( $postId ) ) {
768
+ global $post;
769
+ $postId = $post->ID;
770
+ }
771
  if (get_post_meta($postId, '_EventCountry', true ) == 'United States') {
772
+ return the_event_state( $postId );
773
  } else {
774
+ return the_event_province( $postId );
775
  }
776
  }
777
  /**
the-events-calendar.class.php CHANGED
@@ -400,6 +400,12 @@ if ( !class_exists( 'The_Events_Calendar' ) ) {
400
  }
401
  return $this->defaultOptions;
402
  }
 
 
 
 
 
 
403
 
404
  private function saveOptions($options) {
405
  if (!is_array($options)) {
@@ -471,6 +477,24 @@ if ( !class_exists( 'The_Events_Calendar' ) ) {
471
  wp_enqueue_style('sp-events-calendar-style', WP_CONTENT_URL.'/themes/'.$themeName.'/events/events.css' );
472
  } else wp_enqueue_style('sp-events-calendar-style', $eventsURL.'events.css' );
473
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
474
 
475
  /**
476
  * Helper method to return an array of 1-12 for months
@@ -546,8 +570,20 @@ if ( !class_exists( 'The_Events_Calendar' ) ) {
546
  return $years;
547
  }
548
 
 
 
 
 
 
 
 
 
 
 
 
 
549
  /**
550
- * Creates the category and sets up the theme resource folder with sample config files.
551
  *
552
  * @return void
553
  */
@@ -557,6 +593,7 @@ if ( !class_exists( 'The_Events_Calendar' ) ) {
557
  wp_schedule_event( $firstTime, 'daily', 'reschedule_event_post'); // schedule this for midnight, daily
558
  $this->create_category_if_not_exists( );
559
  $this->flushRewriteRules();
 
560
  }
561
  /**
562
  * This function is scheduled to run at midnight. If any posts are set with EventStartDate
@@ -855,11 +892,12 @@ if ( !class_exists( 'The_Events_Calendar' ) ) {
855
  $this->postExceptionThrown = true;
856
  update_post_meta( $postId, self::EVENTSERROROPT, trim( $e->getMessage() ) );
857
  }
858
- //update meta fields
859
  foreach ( $this->metaTags as $tag ) {
860
  $htmlElement = ltrim( $tag, '_' );
861
  if ( $tag != self::EVENTSERROROPT ) {
862
  if ( isset( $_POST[$htmlElement] ) ) {
 
863
  update_post_meta( $postId, $tag, $_POST[$htmlElement] );
864
  }
865
  }
@@ -1253,16 +1291,26 @@ if ( !class_exists( 'The_Events_Calendar' ) ) {
1253
  /**
1254
  * build an ical feed from events posts
1255
  */
1256
- public function iCalFeed( $postId = null ) {
1257
- $getstring = $_GET['ical'];
 
 
 
 
 
 
 
 
 
 
 
 
1258
  $wpTimezoneString = get_option("timezone_string");
1259
- $categoryId = get_cat_id( The_Events_Calendar::CATEGORYNAME );
1260
  $events = "";
1261
  $lastBuildDate = "";
1262
  $eventsTestArray = array();
1263
  $blogHome = get_bloginfo('home');
1264
  $blogName = get_bloginfo('name');
1265
- $includePosts = ( $postId ) ? '&include=' . $postId : '';
1266
  $eventPosts = get_posts( 'numberposts=-1&category=' . $categoryId . $includePosts );
1267
  foreach( $eventPosts as $eventPost ) {
1268
  // convert 2010-04-08 00:00:00 to 20100408T000000 or YYYYMMDDTHHMMSS
400
  }
401
  return $this->defaultOptions;
402
  }
403
+
404
+ public function getSingleOption( $key ) {
405
+ if( $this->latestOptions ) return $this->latestOptions[$key];
406
+ $options = $this->getOptions();
407
+ return $options[$key];
408
+ }
409
 
410
  private function saveOptions($options) {
411
  if (!is_array($options)) {
477
  wp_enqueue_style('sp-events-calendar-style', WP_CONTENT_URL.'/themes/'.$themeName.'/events/events.css' );
478
  } else wp_enqueue_style('sp-events-calendar-style', $eventsURL.'events.css' );
479
  }
480
+
481
+ /* possible new check for events.css in child themes */
482
+ /*
483
+ public function loadDomainStylesScripts() {
484
+ load_plugin_textdomain( $this->pluginDomain, false, basename(dirname(__FILE__)) . '/lang/');
485
+ $eventsURL = trailingslashit( WP_PLUGIN_URL ) . trailingslashit( plugin_basename( dirname( __FILE__ ) ) ) . 'resources/';
486
+ wp_enqueue_script('sp-events-calendar-script', $eventsURL.'events.js', array('jquery') );
487
+ if( file_exists( TEMPLATEPATH.'/events/events.css' ) ) {
488
+ $templateArray = explode( '/', TEMPLATEPATH );
489
+ $themeName = $templateArray[count($templateArray)-1];
490
+ wp_enqueue_style('sp-events-calendar-style', WP_CONTENT_URL.'/themes/'.$themeName.'/events/events.css' );
491
+ } else if( file_exists( STYLESHEETPATH.'/events/events.css' ) ) {
492
+ $templateArray = explode( '/', STYLESHEETPATH );
493
+ $themeName = $templateArray[count($templateArray)-1];
494
+ wp_enqueue_style('sp-events-calendar-style', WP_CONTENT_URL.'/themes/'.$themeName.'/events/events.css' );
495
+ } else wp_enqueue_style('sp-events-calendar-style', $eventsURL.'events.css' );
496
+ }
497
+ */
498
 
499
  /**
500
  * Helper method to return an array of 1-12 for months
570
  return $years;
571
  }
572
 
573
+ private function updateMapPostMeta() {
574
+ $eventsCatId = get_cat_ID( The_Events_Calendar::CATEGORYNAME );
575
+ $eventPosts = get_posts('numberposts=-1&category='.$eventsCatId);
576
+ foreach( $eventPosts as $place => $object ) {
577
+ $keys = get_post_custom_keys($object->ID);
578
+ if( !in_array( '_EventShowMap', $keys ) ) {
579
+ add_post_meta( $object->ID, '_EventShowMapLink', 'true', true);
580
+ if( $this->getSingleOption( 'embedGoogleMaps' ) == 'on' ) add_post_meta( $object->ID, '_EventShowMap', 'true', true);
581
+ }
582
+ }
583
+ }
584
+
585
  /**
586
+ * Creates the category and sets up the theme resource folder with sample config files. Calls updateMapPostMeta().
587
  *
588
  * @return void
589
  */
593
  wp_schedule_event( $firstTime, 'daily', 'reschedule_event_post'); // schedule this for midnight, daily
594
  $this->create_category_if_not_exists( );
595
  $this->flushRewriteRules();
596
+ $this->updateMapPostMeta();
597
  }
598
  /**
599
  * This function is scheduled to run at midnight. If any posts are set with EventStartDate
892
  $this->postExceptionThrown = true;
893
  update_post_meta( $postId, self::EVENTSERROROPT, trim( $e->getMessage() ) );
894
  }
895
+ //update meta fields
896
  foreach ( $this->metaTags as $tag ) {
897
  $htmlElement = ltrim( $tag, '_' );
898
  if ( $tag != self::EVENTSERROROPT ) {
899
  if ( isset( $_POST[$htmlElement] ) ) {
900
+ if( is_string($_POST[$htmlElement]) ) $_POST[$htmlElement] = filter_var($_POST[$htmlElement], FILTER_SANITIZE_STRING);
901
  update_post_meta( $postId, $tag, $_POST[$htmlElement] );
902
  }
903
  }
1291
  /**
1292
  * build an ical feed from events posts
1293
  */
1294
+ public function iCalFeed() {
1295
+ $getVal = $_GET['ical'];
1296
+ $catObj = get_category_by_slug( $getVal );
1297
+ $eventsCatId = get_cat_id( The_Events_Calendar::CATEGORYNAME );
1298
+ if( $catObj && cat_is_ancestor_of( $eventsCatId, $catObj ) ) {
1299
+ $categoryId = $catObj->term_id;
1300
+ $includePosts = '';
1301
+ } elseif( is_numeric($getVal) ) {
1302
+ $categoryId = $eventsCatId;
1303
+ $includePosts = '&include=' . $getVal;
1304
+ } else {
1305
+ $categoryId = $eventsCatId;
1306
+ $includePosts = '';
1307
+ }
1308
  $wpTimezoneString = get_option("timezone_string");
 
1309
  $events = "";
1310
  $lastBuildDate = "";
1311
  $eventsTestArray = array();
1312
  $blogHome = get_bloginfo('home');
1313
  $blogName = get_bloginfo('name');
 
1314
  $eventPosts = get_posts( 'numberposts=-1&category=' . $categoryId . $includePosts );
1315
  foreach( $eventPosts as $eventPost ) {
1316
  // convert 2010-04-08 00:00:00 to 20100408T000000 or YYYYMMDDTHHMMSS
the-events-calendar.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: The Events Calendar
4
  Plugin URI: http://wordpress.org/extend/plugins/the-events-calendar/
5
  Description: The Events Calendar plugin enables you to rapidly create and manage events using the post editor. Features include optional Eventbrite integration, Google Maps integration as well as default calendar grid and list templates for streamlined one click installation. When updating The Events Calendar, if EventBrite for The Events Calendar is being used, the two plugins must be updated together. Requires PHP 5.1 or above.
6
- Version: 1.6.2
7
  Author: Shane & Peter, Inc.
8
  Author URI: http://www.shaneandpeter.com/
9
  Text Domain: the-events-calendar
3
  Plugin Name: The Events Calendar
4
  Plugin URI: http://wordpress.org/extend/plugins/the-events-calendar/
5
  Description: The Events Calendar plugin enables you to rapidly create and manage events using the post editor. Features include optional Eventbrite integration, Google Maps integration as well as default calendar grid and list templates for streamlined one click installation. When updating The Events Calendar, if EventBrite for The Events Calendar is being used, the two plugins must be updated together. Requires PHP 5.1 or above.
6
+ Version: 1.6.3
7
  Author: Shane & Peter, Inc.
8
  Author URI: http://www.shaneandpeter.com/
9
  Text Domain: the-events-calendar
views/events-list-load-widget-admin.php CHANGED
@@ -1,3 +1,28 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
  <p>
2
  <label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e('Title:',$this->pluginDomain);?></label>
3
  <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $instance['title']; ?>" />
@@ -20,22 +45,27 @@
20
 
21
  <p><?php _e( 'Display:', $this->pluginDomain ); ?><br/>
22
 
23
- <?php $displayoptions = array (
24
- "start" => __('Start Date & Time', $this->pluginDomain),
25
- "end" => __("End Date & Time", $this->pluginDomain),
26
- "venue" => __("Venue", $this->pluginDomain),
27
- "address" => __("Address", $this->pluginDomain),
28
- "city" => __("City", $this->pluginDomain),
29
- "state" => __("State (US)", $this->pluginDomain),
30
- "province" => __("Province (Int)", $this->pluginDomain),
31
- "zip" => __("Postal Code", $this->pluginDomain),
32
- "country" => __("Country", $this->pluginDomain),
33
- "phone" => __("Phone", $this->pluginDomain),
34
- "cost" => __("Price", $this->pluginDomain),
35
- );
36
- foreach ($displayoptions as $option => $label) { ?>
37
- <input class="checkbox" type="checkbox" <?php checked( $instance[$option], 'on' ); ?> id="<?php echo $this->get_field_id( $option ); ?>" name="<?php echo $this->get_field_name( $option ); ?>" style="margin-left:5px"/>
38
- <label for="<?php echo $this->get_field_id( $option ); ?>"><?php echo $label ?></label>
39
- <br/>
40
- <?php } ?>
41
- </p>
 
 
 
 
 
1
+ <script type="text/javascript">
2
+ jQuery(document).ready(function() {
3
+ // show / hide date time boxes
4
+ <?php foreach( array('start','end') as $val ) : ?>
5
+ var <?php echo $val; ?>Checkbox = jQuery('#<?php echo $this->get_field_id( $val ); ?>');
6
+ var <?php echo $val; ?>TimeCheckbox = jQuery('#<?php echo $this->get_field_id( $val.'-time' ); ?>');
7
+ jQuery('input[name="savewidget"]').click(function() {
8
+ if( <?php echo $val; ?>TimeCheckbox.checked || <?php echo $val; ?>Checkbox.checked ) <?php echo $val; ?>TimeCheckbox.closest('li').show();
9
+ });
10
+ <?php echo $val; ?>Checkbox.click(function() {
11
+ if(this.checked) jQuery('#<?php echo $this->get_field_id( $val.'-time' ); ?>-li').slideDown(200);
12
+ else jQuery('#<?php echo $this->get_field_id( $val.'-time' ); ?>-li').slideUp(200);
13
+ });
14
+ <?php endforeach; ?>
15
+ });
16
+ </script>
17
+ <style type="text/css">
18
+ <?php // show / hide date time boxes ?>
19
+ <?php if( $instance['start'] != 'on' && $instance['start-time'] != 'on' ) : ?>
20
+ #<?php echo $this->get_field_id( 'start-time' ); ?>-li {display:none;}
21
+ <?php endif; ?>
22
+ <?php if( $instance['end'] != 'on' && $instance['end-time'] != 'on' ) : ?>
23
+ #<?php echo $this->get_field_id( 'end-time' ); ?>-li {display:none;}
24
+ <?php endif; ?>
25
+ </style>
26
  <p>
27
  <label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e('Title:',$this->pluginDomain);?></label>
28
  <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $instance['title']; ?>" />
45
 
46
  <p><?php _e( 'Display:', $this->pluginDomain ); ?><br/>
47
 
48
+ <?php $displayoptions = array (
49
+ "start" => __('Start Date', $this->pluginDomain),
50
+ "start-time" => __('Start Time', $this->pluginDomain),
51
+ "end" => __("End Date", $this->pluginDomain),
52
+ "end-time" => __('End Time', $this->pluginDomain),
53
+ "venue" => __("Venue", $this->pluginDomain),
54
+ "address" => __("Address", $this->pluginDomain),
55
+ "city" => __("City", $this->pluginDomain),
56
+ "state" => __("State (US)", $this->pluginDomain),
57
+ "province" => __("Province (Int)", $this->pluginDomain),
58
+ "zip" => __("Postal Code", $this->pluginDomain),
59
+ "country" => __("Country", $this->pluginDomain),
60
+ "phone" => __("Phone", $this->pluginDomain),
61
+ "cost" => __("Price", $this->pluginDomain),
62
+ ); ?>
63
+ <ul>
64
+ <?php foreach ($displayoptions as $option => $label) : ?>
65
+ <li id="<?php echo $this->get_field_id( $option ); ?>-li">
66
+ <input class="checkbox" type="checkbox" <?php checked( $instance[$option], 'on' ); ?> id="<?php echo $this->get_field_id( $option ); ?>" name="<?php echo $this->get_field_name( $option ); ?>" style="margin-left:5px"/>
67
+ <label for="<?php echo $this->get_field_id( $option ); ?>"><?php echo $label ?></label>
68
+ </li>
69
+ <?php endforeach; ?>
70
+ </ul>
71
+ </p>
views/events-list-load-widget-display.php CHANGED
@@ -4,42 +4,67 @@
4
  * There is currently no default styling, which is highly needed.
5
  * @return string
6
  */
 
 
 
 
7
  $EventCity = get_post_meta( $post->ID, '_EventCity', true );
8
  $EventCountry = get_post_meta( $post->ID, '_EventCountry', true );
9
  $EventState = get_post_meta( $post->ID, '_EventState', true );
 
10
  $EventProvince = get_post_meta( $post->ID, '_EventProvince', true );
 
 
11
  ?>
12
 
13
  <li class="<?php echo $alt_text ?>">
14
  <div class="when">
15
- <?php echo the_event_start_date( $post->ID, false ); ?>
 
 
 
 
 
 
 
 
 
 
16
  </div>
17
  <div class="event">
18
  <a href="<?php echo get_permalink($post->ID) ?>"><?php echo $post->post_title ?></a>
19
  </div>
20
  <div class="loc"><?php
21
- $space = false;
22
  $output = '';
23
- if ($city == true && $EventCity != '') {
24
- $space = true;
25
- $output = $EventCity . ', ';
 
 
26
  }
27
- if ($state == true || $province == true){
 
 
 
28
  if ( $EventCountry == "United States" && $EventState != '') {
29
- $space = true;
30
- $output .= $EventState;
31
  } elseif ( $EventProvince != '' ) {
32
- $space = true;
33
- $output .= $EventProvince;
34
  }
 
 
 
35
  } else {
36
  $output = rtrim( $output, ', ' );
37
  }
38
- if ( $space ) {
39
- $output .= '<br />';
 
 
 
40
  }
41
- if ($country == true && $EventCountry != '') {
42
- $output .= $EventCountry;
43
  }
44
  echo $output;
45
  ?>
4
  * There is currently no default styling, which is highly needed.
5
  * @return string
6
  */
7
+ $EventStartDate = get_post_meta( $post->ID, '_EventStartDate', true );
8
+ $EventEndDate = get_post_meta( $post->ID, '_EventEndDate', true );
9
+ $EventVenue = get_post_meta( $post->ID, '_EventVenue', true );
10
+ $EventAddress = get_post_meta( $post->ID, '_EventAddress', true );
11
  $EventCity = get_post_meta( $post->ID, '_EventCity', true );
12
  $EventCountry = get_post_meta( $post->ID, '_EventCountry', true );
13
  $EventState = get_post_meta( $post->ID, '_EventState', true );
14
+ $EventZip = get_post_meta( $post->ID, '_EventZip', true );
15
  $EventProvince = get_post_meta( $post->ID, '_EventProvince', true );
16
+ $EventPhone = get_post_meta( $post->ID, '_EventPhone', true );
17
+ $EventCost = get_post_meta( $post->ID, '_EventCost', true );
18
  ?>
19
 
20
  <li class="<?php echo $alt_text ?>">
21
  <div class="when">
22
+ <?php
23
+ if ( $start == 'on' && $EventStartDate != '' ) {
24
+ $time = $startTime == 'on' ? true : false;
25
+ echo the_event_start_date( $post->ID, $time );
26
+ }
27
+ if ( $end == 'on' && $EventEndDate != '' ) {
28
+ if( $start == 'on' && $EventStartDate != '' ) echo ' to ';
29
+ $time = $endTime == 'on' ? true : false;
30
+ echo the_event_end_date( $post->ID, $time );
31
+ }
32
+ ?>
33
  </div>
34
  <div class="event">
35
  <a href="<?php echo get_permalink($post->ID) ?>"><?php echo $post->post_title ?></a>
36
  </div>
37
  <div class="loc"><?php
 
38
  $output = '';
39
+ if ($venue == 'on' && $EventVenue != '') {
40
+ $output = $EventVenue . ', ';
41
+ }
42
+ if ($address == 'on' && $EventAddress != '') {
43
+ $output .= $EventAddress . ', ';
44
  }
45
+ if ($city == 'on' && $EventCity != '') {
46
+ $output .= $EventCity . ', ';
47
+ }
48
+ if ($state == 'on' || $province == 'on') {
49
  if ( $EventCountry == "United States" && $EventState != '') {
50
+ $output .= $EventState . ', ';
 
51
  } elseif ( $EventProvince != '' ) {
52
+ $output .= $EventProvince . ', ';
 
53
  }
54
+ }
55
+ if ($zip == 'on' && $EventZip != '') {
56
+ $output .= $EventZip;
57
  } else {
58
  $output = rtrim( $output, ', ' );
59
  }
60
+ if ($country == 'on' && $EventCountry != '') {
61
+ $output .= '<br />' . $EventCountry;
62
+ }
63
+ if ($phone == 'on' && $EventPhone != '') {
64
+ $output .= '<br />' . $EventPhone;
65
  }
66
+ if ($cost == 'on' && $EventCost != '') {
67
+ $output .= '<br />' . $EventCost;
68
  }
69
  echo $output;
70
  ?>
views/events-meta-box.php CHANGED
@@ -426,18 +426,13 @@ try {
426
  <tr id="google_map_link_toggle"<?php if( !tec_address_exists( $postId ) ) echo ' class="tec_hide"'; ?>>
427
  <td><?php _e('Show Google Map Link:',$this->pluginDomain); ?></td>
428
  <td>
429
- <?php // is the post new?
430
- $tecPostCustomKeys = get_post_custom_keys($postId);
431
- $tecHasCustomKeys = count( $tecPostCustomKeys );
432
- $tecNewPost = ( $tecHasCustomKeys ) ? !in_array( "_EventShowMapLink", $tecPostCustomKeys ) : true;
433
- ?>
434
- <input tabindex="<?php $this->tabIndex(); ?>" type="checkbox" id="EventShowMapLink" name="EventShowMapLink" size="6" value="true" <?php if( $tecNewPost || get_post_meta( $postId, '_EventShowMapLink', true ) == 'true' ) echo 'checked="checked"'?> />
435
  </td>
436
  </tr>
437
  <?php if( eventsGetOptionValue('embedGoogleMaps') == 'on' ) : ?>
438
  <tr id="google_map_toggle"<?php if( !tec_address_exists( $postId ) ) echo ' class="tec_hide"'; ?>>
439
  <td><?php _e('Show Google Map:',$this->pluginDomain); ?></td>
440
- <td><input tabindex="<?php $this->tabIndex(); ?>" type="checkbox" id="EventShowMap" name="EventShowMap" size="6" value="true" <?php if( $tecNewPost || get_post_meta( $postId, '_EventShowMap', true ) == 'true' ) echo 'checked="checked"'; ?> /></td>
441
  </tr>
442
  <?php endif; ?>
443
  <tr>
@@ -465,8 +460,6 @@ try {
465
  <p><?php _e('Interested in selling tickets and tracking registrations? Now you can do it for free using our <a href="http://wordpress.org/extend/plugins/eventbrite-for-the-events-calendar/">Eventbrite Integration Plugin</a>. Eventbrite is a feature rich easy-to-use event management tool. "Wow, you\'re selling Eventbrite pretty hard. You must get a kickback." Well, now that you mention it... we do. We get a little something for everyone that registers an event using our referral link. It\'s how we\'re able to keep supporting and building plugins for the open source community. ', $this->pluginDomain); ?> <a href="http://www.eventbrite.com/r/simpleevents"><?php _e('Check it out here.', $this->pluginDomain); ?></a></p>
466
  </td>
467
  </tr>
468
-
469
-
470
  </table>
471
  </div>
472
  <?php
426
  <tr id="google_map_link_toggle"<?php if( !tec_address_exists( $postId ) ) echo ' class="tec_hide"'; ?>>
427
  <td><?php _e('Show Google Map Link:',$this->pluginDomain); ?></td>
428
  <td>
429
+ <input tabindex="<?php $this->tabIndex(); ?>" type="checkbox" id="EventShowMapLink" name="EventShowMapLink" size="6" value="true" <?php if( get_post_meta( $postId, '_EventShowMapLink', true ) == 'true' ) echo 'checked="checked"'?> />
 
 
 
 
 
430
  </td>
431
  </tr>
432
  <?php if( eventsGetOptionValue('embedGoogleMaps') == 'on' ) : ?>
433
  <tr id="google_map_toggle"<?php if( !tec_address_exists( $postId ) ) echo ' class="tec_hide"'; ?>>
434
  <td><?php _e('Show Google Map:',$this->pluginDomain); ?></td>
435
+ <td><input tabindex="<?php $this->tabIndex(); ?>" type="checkbox" id="EventShowMap" name="EventShowMap" size="6" value="true" <?php if( get_post_meta( $postId, '_EventShowMap', true ) == 'true' ) echo 'checked="checked"'; ?> /></td>
436
  </tr>
437
  <?php endif; ?>
438
  <tr>
460
  <p><?php _e('Interested in selling tickets and tracking registrations? Now you can do it for free using our <a href="http://wordpress.org/extend/plugins/eventbrite-for-the-events-calendar/">Eventbrite Integration Plugin</a>. Eventbrite is a feature rich easy-to-use event management tool. "Wow, you\'re selling Eventbrite pretty hard. You must get a kickback." Well, now that you mention it... we do. We get a little something for everyone that registers an event using our referral link. It\'s how we\'re able to keep supporting and building plugins for the open source community. ', $this->pluginDomain); ?> <a href="http://www.eventbrite.com/r/simpleevents"><?php _e('Check it out here.', $this->pluginDomain); ?></a></p>
461
  </td>
462
  </tr>
 
 
463
  </table>
464
  </div>
465
  <?php
views/events-options.php CHANGED
@@ -94,6 +94,7 @@ try {
94
  <h3><?php _e('Need a hand?',$this->pluginDomain); ?></h3>
95
  <p><?php _e('If you\'re stuck on these options, please <a href="http://wordpress.org/extend/plugins/the-events-calendar/">check out the documentation</a>. If you\'re still wondering what\'s going on, be sure to stop by the support <a href="http://wordpress.org/tags/the-events-calendar?forum_id=10">forum</a> and ask for help. The open source community is full of kind folks who are happy to help.',$this->pluginDomain); ?></p>
96
  <p><?php _e('Here is the iCal feed URL for your events: ' ,$this->pluginDomain); ?><code><?php bloginfo('home'); ?>/?ical</code></p>
 
97
  <table class="form-table">
98
  <tr id="mainDonateRow">
99
  <th scope="row"><?php _e('Donate',$this->pluginDomain); ?></th>
94
  <h3><?php _e('Need a hand?',$this->pluginDomain); ?></h3>
95
  <p><?php _e('If you\'re stuck on these options, please <a href="http://wordpress.org/extend/plugins/the-events-calendar/">check out the documentation</a>. If you\'re still wondering what\'s going on, be sure to stop by the support <a href="http://wordpress.org/tags/the-events-calendar?forum_id=10">forum</a> and ask for help. The open source community is full of kind folks who are happy to help.',$this->pluginDomain); ?></p>
96
  <p><?php _e('Here is the iCal feed URL for your events: ' ,$this->pluginDomain); ?><code><?php bloginfo('home'); ?>/?ical</code></p>
97
+ <p><?php _e('The iCal feed can be sorted by sub-category. Add the category slug to the above URL: ' ,$this->pluginDomain); ?><code><?php bloginfo('home'); ?>/?ical=some-sub-category</code></p>
98
  <table class="form-table">
99
  <tr id="mainDonateRow">
100
  <th scope="row"><?php _e('Donate',$this->pluginDomain); ?></th>
views/gridview.php CHANGED
@@ -28,7 +28,11 @@
28
  <a class='tec-button-on' href='<?php echo events_get_gridview_link(); ?>'><?php _e('Calendar', $spEvents->pluginDomain)?></a>
29
  </span>
30
  </div><!-- tec-events-calendar-header -->
31
- <a class="ical" href="<?php bloginfo('home'); ?>/?ical"><?php _e('iCal Import', $spEvents->pluginDomain) ?></a>
 
 
 
 
32
  <?php event_grid_view( ); // See the plugins/the-events-calendar/views/table.php template for customization ?>
33
  </div>
34
 
28
  <a class='tec-button-on' href='<?php echo events_get_gridview_link(); ?>'><?php _e('Calendar', $spEvents->pluginDomain)?></a>
29
  </span>
30
  </div><!-- tec-events-calendar-header -->
31
+ <?php
32
+ global $wp_query;
33
+ $tecCatObject = get_category( $wp_query->query_vars['cat'])
34
+ ?>
35
+ <a class="ical" href="<?php bloginfo('home'); ?>/?ical=<?php echo $tecCatObject->slug; ?>"><?php _e('iCal Import', $spEvents->pluginDomain) ?></a>
36
  <?php event_grid_view( ); // See the plugins/the-events-calendar/views/table.php template for customization ?>
37
  </div>
38
 
views/list.php CHANGED
@@ -13,7 +13,11 @@
13
  </span>
14
 
15
  </div><!--#tec-events-calendar-header-->
16
- <a class="ical" href="<?php bloginfo('home'); ?>/?ical"><?php _e('iCal Import', $spEvents->pluginDomain) ?></a>
 
 
 
 
17
  <div id="tec-events-loop" class="tec-events post-list clearfix">
18
  <?php while ( have_posts() ) : the_post(); ?>
19
 
@@ -59,7 +63,8 @@
59
  <tr>
60
  <td class="tec-event-meta-desc"><?php _e('Address:', $spEvents->pluginDomain); ?><br />
61
  <?php if( get_post_meta( $post->ID, '_EventShowMapLink', true ) == 'true' ) : ?>
62
- <a class="gmap" href="<?php event_google_map_link(); ?>" title="Click to view a Google Map" target="_blank"><?php _e('Google Map', $spEvents->pluginDomain ); ?></a>
 
63
  <?php endif; ?></td>
64
  <td class="tec-event-meta-value"><?php tec_event_address( $post->ID ); ?></td>
65
  </tr>
13
  </span>
14
 
15
  </div><!--#tec-events-calendar-header-->
16
+ <?php
17
+ global $wp_query;
18
+ $tecCatObject = get_category( $wp_query->query_vars['cat'])
19
+ ?>
20
+ <a class="ical" href="<?php bloginfo('home'); ?>/?ical=<?php echo $tecCatObject->slug; ?>"><?php _e('iCal Import', $spEvents->pluginDomain) ?></a>
21
  <div id="tec-events-loop" class="tec-events post-list clearfix">
22
  <?php while ( have_posts() ) : the_post(); ?>
23
 
63
  <tr>
64
  <td class="tec-event-meta-desc"><?php _e('Address:', $spEvents->pluginDomain); ?><br />
65
  <?php if( get_post_meta( $post->ID, '_EventShowMapLink', true ) == 'true' ) : ?>
66
+ <?php $mapArgs = array("f"=>"q","source"=>"s_q","geocode"=>""); ?>
67
+ <a class="gmap" href="<?php event_google_map_link( null, $mapArgs ); ?>" title="Click to view a Google Map" target="_blank"><?php _e('Google Map', $spEvents->pluginDomain ); ?></a>
68
  <?php endif; ?></td>
69
  <td class="tec-event-meta-value"><?php tec_event_address( $post->ID ); ?></td>
70
  </tr>
views/single.php CHANGED
@@ -8,6 +8,7 @@
8
  <div id="post-<?php the_ID() ?>" <?php post_class() ?>>
9
  <span class="back"><a href="<?php echo events_get_events_link(); ?>"><?php _e('&laquo; Back to Events', $spEvents->pluginDomain); ?></a></span>
10
  <h2 class="entry-title"><?php the_title() ?></h2>
 
11
  <?php if (the_event_end_date() > time() ) { ?><small><?php _e('This event has passed.', $spEvents->pluginDomain) ?></small> <?php } ?>
12
  <div id="tec-event-meta">
13
  <dl class="column">
@@ -35,7 +36,8 @@
35
  <dt>
36
  <?php _e('Address:', $spEvents->pluginDomain) ?><br />
37
  <?php if( get_post_meta( $post->ID, '_EventShowMapLink', true ) == 'true' ) : ?>
38
- <a class="gmap" href="<?php event_google_map_link() ?>" title="<?php _e('Click to view a Google Map', $spEvents->pluginDomain); ?>" target="_blank"><?php _e('Google Map', $spEvents->pluginDomain ); ?></a>
 
39
  <?php endif; ?>
40
  </dt>
41
  <dd>
@@ -48,7 +50,7 @@
48
  <?php if( tec_address_exists( $post->ID ) ) event_google_map_embed(); ?>
49
  <?php endif; ?>
50
  <div class="entry">
51
- <?php the_content() ?>
52
  <?php if (function_exists('the_event_ticket_form')) { the_event_ticket_form(); } ?>
53
  </div>
54
  <?php edit_post_link('Edit', '<span class="edit-link">', '</span>'); ?>
8
  <div id="post-<?php the_ID() ?>" <?php post_class() ?>>
9
  <span class="back"><a href="<?php echo events_get_events_link(); ?>"><?php _e('&laquo; Back to Events', $spEvents->pluginDomain); ?></a></span>
10
  <h2 class="entry-title"><?php the_title() ?></h2>
11
+ <a class="ical" href="<?php bloginfo('home'); ?>/?ical=<?php echo $post->ID; ?>"><?php _e('iCal Import', $spEvents->pluginDomain) ?></a>
12
  <?php if (the_event_end_date() > time() ) { ?><small><?php _e('This event has passed.', $spEvents->pluginDomain) ?></small> <?php } ?>
13
  <div id="tec-event-meta">
14
  <dl class="column">
36
  <dt>
37
  <?php _e('Address:', $spEvents->pluginDomain) ?><br />
38
  <?php if( get_post_meta( $post->ID, '_EventShowMapLink', true ) == 'true' ) : ?>
39
+ <?php $mapArgs = array("f"=>"q","source"=>"s_q","geocode"=>""); ?>
40
+ <a class="gmap" href="<?php event_google_map_link( null, $mapArgs ) ?>" title="<?php _e('Click to view a Google Map', $spEvents->pluginDomain); ?>" target="_blank"><?php _e('Google Map', $spEvents->pluginDomain ); ?></a>
41
  <?php endif; ?>
42
  </dt>
43
  <dd>
50
  <?php if( tec_address_exists( $post->ID ) ) event_google_map_embed(); ?>
51
  <?php endif; ?>
52
  <div class="entry">
53
+ <?php the_content(); ?>
54
  <?php if (function_exists('the_event_ticket_form')) { the_event_ticket_form(); } ?>
55
  </div>
56
  <?php edit_post_link('Edit', '<span class="edit-link">', '</span>'); ?>