adding shortcode and starting the front models and views

fixed issue with edit dialog boxes not having prompts, started the front end shortcode

diff --git a/classes/data/dataAssetTypes.php b/classes/data/dataAssetTypes.php
index 54b6ce5..636ef6b 100644 (file)
--- a/classes/data/dataAssetTypes.php
+++ b/classes/data/dataAssetTypes.php
@@ -137,6 +137,7 @@ class GlmDataAssetsAssetTypes extends GlmDataAbstract
                 'type' => 'list',
                 'list' => $this->config['use_type'],
                 'force_list' => true,
+                'required' => true,
                 'use' => 'a'
             ),
 
@@ -144,6 +145,7 @@ class GlmDataAssetsAssetTypes extends GlmDataAbstract
             'lead_time' => array (
                 'field' => 'lead_time',
                 'type' => 'integer',
+                'required' => true,
                 'use' => 'a'
             ),
 
@@ -151,6 +153,7 @@ class GlmDataAssetsAssetTypes extends GlmDataAbstract
             'reuse_time' => array (
                 'field' => 'reuse_time',
                 'type' => 'integer',
+                'required' => true,
                 'use' => 'a'
             ),
 
@@ -158,6 +161,7 @@ class GlmDataAssetsAssetTypes extends GlmDataAbstract
             'cost' => array (
                 'field' => 'cost',
                 'type' => 'money',
+                'required' => true,
                 'use' => 'a'
             ),
 
@@ -165,6 +169,7 @@ class GlmDataAssetsAssetTypes extends GlmDataAbstract
             'hold_time' => array (
                 'field' => 'hold_time',
                 'type' => 'integer',
+                'required' => true,
                 'use' => 'a'
             ),
 
@@ -174,6 +179,7 @@ class GlmDataAssetsAssetTypes extends GlmDataAbstract
                 'type' => 'list',
                 'list' => $this->config['map_item_type'],
                 'force_list' => true,
+                'required' => true,
                 'use' => 'a'
             )
 

diff --git a/models/front/assets/index.php b/models/front/assets/index.php
new file mode 100644 (file)
index 0000000..3ac00fa
--- /dev/null
+++ b/models/front/assets/index.php
@@ -0,0 +1,8 @@
+<?php
+
+/* 
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+

diff --git a/setup/shortcodes.php b/setup/shortcodes.php
index 0b2fa96..ccf65e8 100644 (file)
--- a/setup/shortcodes.php
+++ b/setup/shortcodes.php
@@ -88,6 +88,17 @@
  */
 
 $glmMembersAssetsShortcodes = array(
+    // Short code for all assets related pages. "page" parameter sets page to be produced.
+    'glm-members-assets' => array(
+        'plugin'     => GLM_MEMBERS_ASSETS_PLUGIN_SLUG,
+        'menu'       => 'assets',
+        'action'     => 'index',
+        'table'      => false,
+        'attributes' => array(
+
+
+        )
+    ),
 );
 
 $glmMembersAssetsShortcodesDescription = '';

diff --git a/setup/validActions.php b/setup/validActions.php
index a518251..f3f4656 100644 (file)
--- a/setup/validActions.php
+++ b/setup/validActions.php
@@ -70,6 +70,9 @@ $glmMembersAssetsAddOnValidActions = array(
         ),
     ),
     'frontActions' => array(
+        'assets' => array(
+            'index' => GLM_MEMBERS_ASSETS_PLUGIN_SLUG
+        ),
     )
 );
 

diff --git a/views/admin/settings/assetTypes.html b/views/admin/settings/assetTypes.html
index bc701bf..83ff956 100644 (file)
--- a/views/admin/settings/assetTypes.html
+++ b/views/admin/settings/assetTypes.html
@@ -12,36 +12,70 @@
             <form action="{$thisUrl}?page={$thisPage}" method="post" enctype="multipart/form-data">
                 <input type="hidden" name="glm_action" value="assetTypes">
                 <input type="hidden" name="option" value="addNew">
-                
+                <p><span class="glm-required">*</span> Required</p>
                 <!-- This is only temporary until we reinstate the "Used With" selection below -->
                 <table class="glm-admin-table">
                     <tr>
-                        <th class="glm-required">Asset Type Name: </th>
+                        <th class="glm-required"> Name: </th>
                         <td>
                             <input data-id="code" type="text" name="name" class="glm-form-text-input">
+                        </td>
+                    </tr>
+                    <tr>
+                        <th class="glm-required">Cost: </th>
+                        <td>
                             <input data-id="code" type="text" name="cost" class="glm-form-text-input">
+                        </td>
+                    </tr>
+                    <tr>
+                        <th>Description: </th>
+                        <td>
                             <input data-id="code" type="text" name="descr" class="glm-form-text-input">
+                        </td>
+                    </tr>
+                    <tr>
+                        <th class="glm-required"> Lead Time: </th>
+                        <td>
                             <input data-id="code" type="text" name="lead_time" class="glm-form-text-input">
+                        </td>
+                    </tr>
+                    <tr>
+                        <th class="glm-required">Reuse Time: </th>
+                        <td>
                             <input data-id="code" type="text" name="reuse_time" class="glm-form-text-input">
+                        </td>
+                    </tr>
+                    <tr>
+                        <th class="glm-required">Hold Time </th>
+                        <td>
                             <input data-id="code" type="text" name="hold_time" class="glm-form-text-input">
-                            <input data-id="code" type="text" name="use_type" class="glm-form-text-input">
+                        </td>
+                    </tr>
+
+                    <tr>
+                        <th class="glm-required">Map Item Type: </th>
+                        <td>
                             <select name="map_item_type" data-id="map-item-type">
                                 <option value="">Select Map Item Type</option>
                                 {foreach $useTypes.map_item_type as $mapItem=>$name}
                                     <option value="$mapItem">{$name}</option>
                                 {/foreach}
                             </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th class="glm-required"> Use Type: </th>
+                        <td>
                             <select name="use_type" data-id="use-type">
                                 <option value="">Select Use Type</option>
                                 {foreach $useTypes.use_type as $useType=>$name}
                                     <option value="{$useType}">{$name}</option>
                                 {/foreach}
                             </select>
-                      
                         </td>
                     </tr>
                 </table>
-                <p><span class="glm-required">*</span> Required</p>
+    
                 <a id="newAssetTypeCancel" class="button button-primary glm-right">Cancel</a>
                 <input type="submit" value="Add new AssetType" class="button button-primary">
                 
@@ -63,24 +97,60 @@
                 <input type="hidden" name="glm_action" value="assetTypes">
                 <input type="hidden" name="option" value="update">
                 <input id="editAssetTypeID" type="hidden" name="id" value="">
-
+                <p><span class="glm-required">*</span> Required</p>
                 <!-- This is only temporary until we reinstate the "Used With" selection below -->
                 <table class="glm-admin-table">
-                      <tr>
-                        <th class="glm-required">Asset Type Name:</th>
-                        <td>
-                            <input id="edit-name" data-id="code" type="text" name="name" class="glm-form-text-input">
-                            <input id="edit-cost" data-id="code" type="text" name="cost" class="glm-form-text-input">
-                            <input id="edit-descr" data-id="code" type="text" name="descr" class="glm-form-text-input">
-                            <input id="edit-lead_time" data-id="code" type="text" name="lead_time" class="glm-form-text-input">
-                            <input id="edit-reuse_time" data-id="code" type="text" name="reuse_time" class="glm-form-text-input">
-                            <input id="edit-hold_time" data-id="code" type="text" name="hold_time" class="glm-form-text-input">
+                    <tr>
+                        <th class="glm-required"> Name: </th>
+                        <td>
+                            <input id="edit-name" type="text" name="name" class="glm-form-text-input">
+                        </td>
+                    </tr>
+                    <tr>
+                        <th class="glm-required">Cost: </th>
+                        <td>
+                            <input id="edit-cost" type="text" name="cost" class="glm-form-text-input">
+                        </td>
+                    </tr>
+                    <tr>
+                        <th>Description: </th>
+                        <td>
+                            <input id="edit-descr" type="text" name="descr" class="glm-form-text-input">
+                        </td>
+                    </tr>
+                    <tr>
+                        <th class="glm-required"> Lead Time: </th>
+                        <td>
+                            <input id="edit-lead_time" type="text" name="lead_time" class="glm-form-text-input">
+                        </td>
+                    </tr>
+                    <tr>
+                        <th class="glm-required">Reuse Time: </th>
+                        <td>
+                            <input id="edit-reuse_time" type="text" name="reuse_time" class="glm-form-text-input">
+                        </td>
+                    </tr>
+                    <tr>
+                        <th class="glm-required">Hold Time </th>
+                        <td>
+                            <input id="edit-hold_time" type="text" name="hold_time" class="glm-form-text-input">
+                        </td>
+                    </tr>
+ 
+                    <tr>
+                        <th class="glm-required">Map Item Type: </th>
+                        <td>
                             <select name="map_item_type" id="edit-map_item_type" data-id="map-item-type">
                                 <option value="">Select Map Item Type</option>
                                 {foreach $useTypes.map_item_type as $mapItem=>$name}
                                     <option value="{$mapItem}">{$name}</option>
                                 {/foreach}
                             </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <th class="glm-required">Use Type: </th>
+                        <td>
                             <select name="use_type" id="edit-use_type" data-id="use-type">
                                 <option value="">Select Use Type</option>
                                 {foreach $useTypes.use_type as $useType=>$name}
@@ -88,9 +158,10 @@
                                 {/foreach}
                             </select>
                         </td>
-                      </tr>
+                    </tr>
+
                 </table>
-                <p><span class="glm-required">*</span> Required</p>
+                
                 <a id="editAssetTypeCancel" class="button button-primary glm-right">Cancel</a>
                 <input type="submit" value="Update this Asset Type">