Last changes before initial deployment
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 4 May 2016 19:20:34 +0000 (15:20 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 4 May 2016 19:20:34 +0000 (15:20 -0400)
models/admin/member/packaging.php
models/admin/packaging/index.php
setup/adminMenus.php
setup/adminTabs.php
views/admin/member/packaging.html
views/admin/packaging/index.html

index 221598b..9641aa9 100644 (file)
@@ -253,6 +253,9 @@ class GlmMembersAdmin_member_packaging extends GlmDataPackages
                     $packageDeleted = true;
                 }
 
+                // Look for matching package elements
+                // **** NEED TO MAKE SURE THAT THE MACTHING PACKAGE ELEMENTS ARE DELETED!!! **** //
+
             case 'list':
             default:
 
index 5c4d09b..fcb6563 100644 (file)
@@ -211,7 +211,7 @@ class GlmMembersAdmin_packaging_index extends GlmDataPackages
                 }
 
                 // Look for matching package elements
-// **** NEED TO MAKE SURE THAT THE MACTHING PACKAGE ELEMENTS ARE DELETED!!! **** //
+                // **** NEED TO MAKE SURE THAT THE MACTHING PACKAGE ELEMENTS ARE DELETED!!! **** //
 
                 break;
 
index 0600747..63a5ab9 100644 (file)
  */
 
 add_submenu_page(
-    'glm-members-admin-menu-members',                   // Parent slug
+    $mainMenuSlug,                   // Parent slug
     'Packaging',                                        // Page title
     'Packaging',                                        // Menu Title
-    'glm_members_members',                              // Capability required
+    'glm_members_edit_my_entity',                       // Capability required
     'glm-members-admin-menu-packaging-index',           // Menu slug
     function() {$this->controller('packaging');}
 );
+/*
+// If a contact is logged in (ownEntity isn't false), add Contact Profile menu item
+if ($this->config['loggedInUser']['contactUser']) {
+
+    add_submenu_page(
+        $mainMenuSlug,
+        'Packaging',
+        'Packaging',
+        'glm_members_edit_my_entity',
+        'glm-members-admin-menu-packaging-index',
+        function() {$this->controller('packaging');}
+    );
+
+}
 
-?>
+*/
\ No newline at end of file
index 16a2a68..ebfba8a 100644 (file)
  *
  */
 
-if (apply_filters('glm_members_permit_admin_member_packages_tab', true)) {
-    add_filter('glm-member-db-add-tab-for-member',
-        function($addOnTabs) {
-            $newTabs = array(
-                array(
-                    'text' => 'Packaging',
-                    'menu' => 'member',
-                    'action' => 'packaging'
-                )
-            );
-            $addOnTabs = array_merge($addOnTabs, $newTabs);
-            return $addOnTabs;
-        }
-    );
-}
+// If user can manage all members
+if (current_user_can('glm_members_members')) {
 
+    if (apply_filters('glm_members_permit_admin_member_packages_tab', true)) {
+        add_filter('glm-member-db-add-tab-for-member',
+            function($addOnTabs) {
+                $newTabs = array(
+                    array(
+                        'text' => 'Packaging',
+                        'menu' => 'member',
+                        'action' => 'packaging'
+                    )
+                );
+                $addOnTabs = array_merge($addOnTabs, $newTabs);
+                return $addOnTabs;
+            }
+        );
+    }
 
+    if (apply_filters('glm_members_permit_admin_members_packaging_tab', true)) {
+        add_filter('glm-member-db-add-tab-for-management',
+            function($addOnTabs) {
+                $newTabs = array(
+                    array(
+                        'text' => 'Packaging',
+                        'menu' => 'management',
+                        'action' => 'packaging'
+                    )
+                );
+                $addOnTabs = array_merge($addOnTabs, $newTabs);
+                return $addOnTabs;
+            }
+        );
+    }
 
-if (apply_filters('glm_members_permit_admin_members_packaging_tab', true)) {
-    add_filter('glm-member-db-add-tab-for-management',
-        function($addOnTabs) {
-            $newTabs = array(
-                array(
-                    'text' => 'Packaging',
-                    'menu' => 'management',
-                    'action' => 'packaging'
-                )
-            );
-            $addOnTabs = array_merge($addOnTabs, $newTabs);
-            return $addOnTabs;
-        }
-    );
-}
-
-
-?>
\ No newline at end of file
+}
\ No newline at end of file
index 0a11ffb..3df5024 100644 (file)
@@ -2,13 +2,13 @@
 
 {if $packageDeleted}
     <h2><span class="glm-notice glm-flash-updated">Package Deleted:</span></h2>
-{/if}            
+{/if}   
+{if $packageUpdated}<h2 class="glm-notice glm-flash-updated">Package Updated</h2>{/if}         
 
 {if $option == 'edit' || $option == 'add'}
 
   {if apply_filters('glm_members_permit_admin_member_packaging_edit_package', true)}
 
-        {if $packageUpdated}<h2 class="glm-notice glm-flash-updated glm-right">Package Updated</h2>{/if}
         {if $packageError}<h2 class="glm-error glm-flash-updated glm-right">Error submitting package, see below...</h2>{/if}
     
       {if $option == 'edit'}
 
   {else} <!-- Can just display -->
 
+        <h2>Display Package</h2>
         <table class="glm-admin-table">
             <tr><th>Title:</th><td>{$packageInfo.fieldData.title}</td></tr>
             <tr><th>Active:</th><td>{$packageInfo.fieldData.active.name}</td></tr>
index 8a46ba5..939f267 100644 (file)
       {else}
         <h2>Add new Multi-{$terms.term_member_cap} Package</h2>
       {/if}
-        <a href="{$thisUrl}?page={$thisPage}&glm_action=packaging" class="button button-primary glm-button glm-right">Return to Package List</a>
+        <a href="{$thisUrl}?page=glm-members-admin-menu-packaging-index&glm_action=index&option=list" class="button button-primary glm-button glm-right">Return to Package List</a>
         
     
         <form action="{$thisUrl}?page={$thisPage}" method="post" enctype="multipart/form-data">
-            <input type="hidden" name="glm_action" value="packaging">
+            <input type="hidden" name="glm_action" value="index">
             <input type="hidden" name="ref_type" value="0">
             <input type="hidden" name="ref_dest" value="0">
           {if $havePackage}
                     </td>
                 </tr>
                 
-    <!-- NOT COMPLETING PARTICIPATING MEMBERS AT THIS TIME -->
-                
+<!-- NOT COMPLETING PARTICIPATING MEMBERS AT THIS TIME 
+
                 <tr>
                     <th>Participating {$terms.term_member_cap}</th>
                     <td class="glm-imageGalleryContainer">
                         <input type="hidden" id="galleryPositionOrder" name="galleryPositionOrder" 
                             value="{if $havePackageMembers}{foreach $gallery as $i name=ig}{if $i.title}{$i.id}{if not $smarty.foreach.ig.last},{/if}{/if}{/foreach}{/if}" />
     
-                        <!-- The contents of this div are read by imageUpload.js to use as a template for inserting a new image into the gallery area -->
+-- The contents of this div are read by imageUpload.js to use as a template for inserting a new image into the gallery area --
                         <div id="glmGalleryItmeDataTemplate" class="glm-imageItemHidden">
                             <li id="packageMember_{ id }" class="glm-galleryContainerFlexible">
                                 <input type="hidden" name="packageMember_{ id }" value="{ id }">
                                     </table>
                             </li>
                         </div>
-                        <!-- End of template -->
+ -- end of template --
                         <div class="glm-imageGalleryContainer glm-item-container">
                             <ul id="glmPackageMembersList" class=".glm-galleryContainer">
             {if $havePackageMembers}     
-                                <!-- Note that id in li is needed for sorting -->
+-- Note that id in li is needed for sorting --
                 {foreach $packageMembers as $i}
                                 <li id="packageMember_{$i.id}" class="glm-galleryContainerFlexible">
                                     <input type="hidden" name="packageMember_{$i.id}" value="{$i.id}">
                         </div>
                     </td>
                 </tr>
-    
+-->
+                    
                 
             </table>
             <input type="submit" value="{if $havePackage}Update Package{else}Add New Package{/if}">
         
   {else} <!-- Can just display -->
           
+         <h2>Display Package</h2>
         <table class="glm-admin-table">
             <tr><th>Title:</th><td>{$packageInfo.fieldData.title}</td></tr>
             <tr><th>Name for URLs:</th><td>{$packageInfo.fieldData.package_slug}</td></tr>
 {else} <!-- option is not edit or add -->
     
   {if apply_filters('glm_members_permit_admin_members_packaging_add_package', true)}
-    <div id="addPackageButton" class="button button-primary glm-right" title='To create a {$terms.term_member} specific package, select that {$terms.term_member} from the "{$terms.term_member_cap} List" tab then select "Packaging" tab.'>&nbsp;&nbsp;Add a Multi-{$terms.term_member_cap} Package</div>
+<!-- Not doing multi-member packaging just yet.  
+    <div id="addPackageButton" class="button button-primary glm-right" title='To create a {$terms.term_member} specific package, select that {$terms.term_member} from the "{$terms.term_member_cap} List" tab then select "Packaging" tab.'>&nbsp;&nbsp;Add a Multi-{$terms.term_member_cap} Package</div> 
+-->
   {/if}
       
     <!-- Package list selection form -->      
             <tr>
                 <td class="glm-nowrap">
         {if $p.ref_type.value}
-                    <a href="{$thisUrl}?page=glm-members-admin-menu-member&glm_action=packaging&option=edit&member={$p.ref_dest}&packageID={$p.id}">{$p.title}</a>
+                    <a href="{$thisUrl}?page=glm-members-admin-menu-packaging-index&glm_action=index&option=edit&member={$p.ref_dest}&packageID={$p.id}">{$p.title}</a>
         {else}
                     <a href="{$thisUrl}?page={$thisPage}&glm_action=packaging&option=edit&packageID={$p.id}">{$p.title}</a>
         {/if}