Revert "added shareThis to detail page, testing ical, add page from client, calender...

This reverts commit 9035020b30c58c120a4a4d0943fe5dd2328af785.

Conflicts:
	css/front.css
	setup/shortcodes.php

diff --git a/css/front.css b/css/front.css
index 2211ea9..a1a1924 100644 (file)
--- a/css/front.css
+++ b/css/front.css
@@ -112,6 +112,4 @@
   height: 22px;
   background-position: 0px 0px !important;
 }
-#addEventFields{
-  
-}
\ No newline at end of file
+

diff --git a/js/front.js b/js/front.js
index ef814a8..4a5dfbf 100644 (file)
--- a/js/front.js
+++ b/js/front.js
@@ -18,15 +18,6 @@ var EventFront = {
         jQuery(".glm-read-more").click(function(){
             this.preventDefault();
             return false;
-        });
-        jQuery("#addEvent").on("click", function (e){
-            e.preventDefault();
-            jQuery("#addEventFields").slideToggle('slow');
-            jQuery(this).toggleClass('open');
-            return false;
-       
-            
-            
         });
     }
 };

diff --git a/models/front/events/detail.php b/models/front/events/detail.php
index ce516aa..3ecb45d 100644 (file)
--- a/models/front/events/detail.php
+++ b/models/front/events/detail.php
@@ -56,6 +56,7 @@ class GLmMembersFront_events_detail extends GlmMembersFront_events_baseAction
                   WHERE name_slug = '$eventslug'";
             $eventId = $this->wpdb->get_var($sql);
         }
+
         $categories = $this->getCategories();
         wp_register_script(
             'googlemaps-js',
@@ -97,10 +98,7 @@ class GLmMembersFront_events_detail extends GlmMembersFront_events_baseAction
             $categoryEvents = array();
             break;
         }
-
-        // for shareThis url and title variables in its span tag
         $permalink = "http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]";
-        $icsFile = get_permalink(2934);
         $title = get_the_title();
         
         // Compile template data
@@ -112,7 +110,6 @@ class GLmMembersFront_events_detail extends GlmMembersFront_events_baseAction
             'event'       => $event,
             'permalink'   => $permalink,
             'title'       => $title,
-            'icsFile'     => $icsFile,
             'mainImgUrl'  => GLM_MEMBERS_PLUGIN_MEDIA_URL . '/images/large/'
         );
 
@@ -126,6 +123,4 @@ class GLmMembersFront_events_detail extends GlmMembersFront_events_baseAction
             'settings'         => $settings
         );
     }
-
 }
-

diff --git a/setup/shortcodes.php b/setup/shortcodes.php
index 8a4dba4..c2ca3de 100644 (file)
--- a/setup/shortcodes.php
+++ b/setup/shortcodes.php
@@ -113,17 +113,8 @@ $glmMembersEventsShortcodes = array(
         'attributes' => array(
             'id' => false
         )
+
     ),
-    'glm-members-event-frontAdd' => array(
-        'plugin'     => GLM_MEMBERS_EVENTS_PLUGIN_SLUG,
-        'menu'       => 'events',
-        'action'     => 'frontAdd',
-        'table'      => false,
-        'attributes' => array(
-            'id' => false
-        )
-    ),
-    
 );
 
 $glmMembersEventsShortcodesDescription = '

diff --git a/views/front/events/shortCuts.html b/views/front/events/shortCuts.html
index ad3a027..a37abb9 100644 (file)
--- a/views/front/events/shortCuts.html
+++ b/views/front/events/shortCuts.html
@@ -3,7 +3,6 @@
             <li><a href="{$currentUrl}?t=today" class="shortcuts-button">Today's Events</a></li>
             <li><a href="{$currentUrl}?t=tomorrow" class="shortcuts-button">Tomorrow's Events</a></li>
             <li><a href="{$currentUrl}?t=nextseven" class="shortcuts-button">Next 7 Days</a></li>
-            <li id="addEvent"><a href="#" class="shortcuts-button">Add an Event</a></li>
         </ul>
     </div>