Cleaned up incompatible template references to URL/Url.

diff --git a/views/admin/member/contacts.html b/views/admin/member/contacts.html
index dbd58e9..4de1f63 100644 (file)
--- a/views/admin/member/contacts.html
+++ b/views/admin/member/contacts.html
@@ -15,7 +15,7 @@
   {if $option == 'list'}
 
     {if apply_filters('glm_members_permit_admin_member_contacts_add_contact', true)}
-    <a href="{$thisURL}?page={$thisPage}&glm_action=contacts&member={$memberID}&option=create" class="button button-primary glm-button glm-right">Add New Member Contact</a>
+    <a href="{$thisUrl}?page={$thisPage}&glm_action=contacts&member={$memberID}&option=create" class="button button-primary glm-button glm-right">Add New Member Contact</a>
     {/if}
     <form class="glm-right" onSubmit="return false;">
        <span{if $haveFilter} class="glm-notice"{/if}><b>List Filters:</b>&nbsp;&nbsp;</span> 
@@ -44,7 +44,7 @@
             <tr>
                 <td class="glm-shrink">
         {if apply_filters('glm_members_permit_admin_member_contacts_view_contact', true)}
-                    <a href="{$thisURL}?page=glm-members-admin-menu-member&glm_action=contacts&option=edit&member={$c.ref_dest}&contact={$c.id}">{$c.lname}, {$c.fname}</a>
+                    <a href="{$thisUrl}?page=glm-members-admin-menu-member&glm_action=contacts&option=edit&member={$c.ref_dest}&contact={$c.id}">{$c.lname}, {$c.fname}</a>
         {else}
                     {$c.lname}, {$c.fname}
         {/if}                    
@@ -108,7 +108,7 @@
 
     {if $option == 'create' || $option == 'edit'}
 
-         <a href="{$thisURL}?page={$thisPage}&glm_action=contacts&member={$memberID}" class="button button-primary glm-button glm-right">Return to Contact List</a>
+         <a href="{$thisUrl}?page={$thisPage}&glm_action=contacts&member={$memberID}" class="button button-primary glm-button glm-right">Return to Contact List</a>
             
       {if $option == 'create'}
         <h2 class="glm-left">Add New Contact</h2>   
@@ -141,7 +141,7 @@
       {/if}
         
       
-        <form action="{$thisURL}?page={$thisPage}" method="post" enctype="multipart/form-data">
+        <form action="{$thisUrl}?page={$thisPage}" method="post" enctype="multipart/form-data">
             <input type="hidden" name="glm_action" value="contacts">
             <input type="hidden" name="member" value="{$memberData.id}">
         {if $option == 'create'}
@@ -310,12 +310,12 @@
                     <td {if $contactInfo.fieldFail.image}class="glm-form-bad-input"{/if}>
             {if $contactInfo.fieldData.image}
                         <div id="largeImageDialog" class="glm-dialog-box" title="Large sized image">
-                            <img src="{$glmPluginMediaURL}/images/large/{$contactInfo.fieldData.image}">
+                            <img src="{$glmPluginMediaUrl}/images/large/{$contactInfo.fieldData.image}">
                             <a id="largeImageCancel" class="button button-primary glm-right">Close</a><br>
                         </div>
                         <table class="glm-admin-image-edit-table">
                             <tr>
-                                <td><img src="{$glmPluginMediaURL}/images/thumb/{$contactInfo.fieldData.image}"></td> 
+                                <td><img src="{$glmPluginMediaUrl}/images/thumb/{$contactInfo.fieldData.image}"></td> 
                                 <td>
                                     <input type="checkbox" name="image_delete"> Delete Image<br>
                                     {$contactInfo.fieldData.image}<br>
@@ -495,7 +495,7 @@
                     <th>Image:</th>
                     <td>
             {if $contactInfo.fieldData.image}
-                        <img src="{$glmPluginMediaURL}/images/thumb/{$contactInfo.fieldData.image}">
+                        <img src="{$glmPluginMediaUrl}/images/thumb/{$contactInfo.fieldData.image}">
             {/if} 
                     </td>
                 </tr>
@@ -547,7 +547,7 @@
                     filter += '&filterText=' + encodeURIComponent(filterText).replace(/%20/g,'+');
                 }
                 
-                window.location.href = "{$thisURL}?page={$thisPage}&glm_action=contacts&member={$memberID}" + filter;
+                window.location.href = "{$thisUrl}?page={$thisPage}&glm_action=contacts&member={$memberID}" + filter;
                 
                 return false;
             });
@@ -654,7 +654,7 @@
                 $("#deleteContactDialog").dialog("close");
             });            
             $('#deleteContactSubmit').click( function() {
-                window.location.replace("{$thisURL}?page={$thisPage}&glm_action=contacts&member={$memberID}&option=delete&contact={$contactID}");
+                window.location.replace("{$thisUrl}?page={$thisPage}&glm_action=contacts&member={$memberID}&option=delete&contact={$contactID}");
             });
 
             // Flash certain elements for a short time after display      

diff --git a/views/admin/members/contacts.html b/views/admin/members/contacts.html
index ae8d06c..c405bf1 100644 (file)
--- a/views/admin/members/contacts.html
+++ b/views/admin/members/contacts.html
@@ -25,14 +25,14 @@
 {if $haveContacts}
     {foreach $contacts as $c}
             <tr>
-                <td class="glm-shrink"><a href="{$thisURL}?page=glm-members-admin-menu-member&glm_action=contacts&option=edit&member={$c.ref_dest}&contact={$c.id}">{$c.lname}, {$c.fname}</a></td>
+                <td class="glm-shrink"><a href="{$thisUrl}?page=glm-members-admin-menu-member&glm_action=contacts&option=edit&member={$c.ref_dest}&contact={$c.id}">{$c.lname}, {$c.fname}</a></td>
                 <td class="glm-shrink">{$c.active.name}</td>
                 <td>{$c.contact_type.name}</td>
                 <td class="glm-shrink">{$c.access.name}</td>
                 <td class="glm-nowrap">{$c.contact_role_short.name}</td>
                 <td class="glm-nowrap">
                     {$c.ref_type.name}: 
-                    <a href="{$thisURL}?page=glm-members-admin-menu-member&glm_action=index&member={$c.ref_dest}">{$c.ref_dest_name}</a>
+                    <a href="{$thisUrl}?page=glm-members-admin-menu-member&glm_action=index&member={$c.ref_dest}">{$c.ref_dest_name}</a>
                 </td>
                 <td class="glm-shrink">{$c.org}</td>
                 <td class="glm-shrink">{$c.city.name}, {$c.state.name}</td>
@@ -63,7 +63,7 @@
                     filter += '&filterText=' + encodeURIComponent(filterText).replace(/%20/g,'+');
                 }
                 
-                window.location.href = "{$thisURL}?page={$thisPage}&glm_action=contacts" + filter;
+                window.location.href = "{$thisUrl}?page={$thisPage}&glm_action=contacts" + filter;
                 
                 return false;
             });

diff --git a/views/admin/profile/header.html b/views/admin/profile/header.html
index 1186e17..7717c57 100644 (file)
--- a/views/admin/profile/header.html
+++ b/views/admin/profile/header.html
@@ -1,9 +1,9 @@
 <div class="wrap">
     <h2>Your Contact and Log-in Profile</h2>
     <h2 class="nav-tab-wrapper">
-        <a href="{$thisURL}?page={$thisPage}&glm_action=index" class="nav-tab{if $thisAction==index} nav-tab-active{/if}">User Profile</a>
+        <a href="{$thisUrl}?page={$thisPage}&glm_action=index" class="nav-tab{if $thisAction==index} nav-tab-active{/if}">User Profile</a>
 {foreach $addOnTabs as $a}
-        <a href="{$thisURL}?page=glm-members-admin-menu-{$a.menu}&glm_action={$a.action}" class="nav-tab{if $thisAction==$a.action} nav-tab-active{/if}">{$a.text}</a>
+        <a href="{$thisUrl}?page=glm-members-admin-menu-{$a.menu}&glm_action={$a.action}" class="nav-tab{if $thisAction==$a.action} nav-tab-active{/if}">{$a.text}</a>
 {/foreach}        
     </h2>
     <div id="glm-admin-content-container">

diff --git a/views/admin/profile/index.html b/views/admin/profile/index.html
index bee564f..17cba20 100644 (file)
--- a/views/admin/profile/index.html
+++ b/views/admin/profile/index.html
@@ -9,7 +9,7 @@
         </p>
         
         {if $contactUpdated}<h2 class="glm-notice glm-flash-updated">Contact Updated</h2>{/if}
-        <form action="{$thisURL}?page={$thisPage}" method="post" enctype="multipart/form-data">
+        <form action="{$thisUrl}?page={$thisPage}" method="post" enctype="multipart/form-data">
             <input type="hidden" name="glm_action" value="index">
             <input type="hidden" name="option" value="submit">
             <input type="hidden" name="contact" value="{$contactInfo.fieldData.id}">
@@ -102,7 +102,7 @@
                             <tr>
                                 <td>
                                     <div class="glm-galleryImage" data-id="image">
-                                        <img src="{$glmPluginMediaURL}/images/small/{$contactInfo.fieldData.image}">
+                                        <img src="{$glmPluginMediaUrl}/images/small/{$contactInfo.fieldData.image}">
                                     </div>
                                 </td>
                                 <td>
@@ -113,7 +113,7 @@
             {/if}
                             <tr><td colspan="2"><b>New image:</b> <input type="file" name="image_new"></td></tr>
                         </table>
-                        <div id="glm-galleryImageLarger_image" class="glm-imageDialog"><img src="{$glmPluginMediaURL}/images/large/{$contactInfo.fieldData.image}"></div>
+                        <div id="glm-galleryImageLarger_image" class="glm-imageDialog"><img src="{$glmPluginMediaUrl}/images/large/{$contactInfo.fieldData.image}"></div>
                         {if $contactInfo.fieldFail.image}<p>{$contactInfo.fieldFail.image}</p>{/if}
                     </td>
                 </tr>
@@ -271,7 +271,7 @@
                 <th>Image:</th>
                 <td>
         {if $contactInfo.fieldData.image}
-                    <img src="{$glmPluginMediaURL}/images/thumb/{$contactInfo.fieldData.image}">
+                    <img src="{$glmPluginMediaUrl}/images/thumb/{$contactInfo.fieldData.image}">
         {/if} 
                 </td>
             </tr>