[Rt-commit] rt branch, 4.4/core-assets, updated. rt-4.2.11-47-gdcee687

[Todd Wade]

The branch, 4.4/core-assets has been updated
       via  dcee68733a9bc5409bff43ecb117b512c77fefad (commit)
      from  a3264ced4003d0302bd11b0b069a92da33c81717 (commit)

Summary of changes:
 share/html/Admin/Assets/Catalogs/Roles.html                           | 4 ++--
 .../{Elements/Assets/AddPeople => Asset/Elements/AddCatalogPeople}    | 0
 .../{Elements/Assets/EditPeople => Asset/Elements/EditCatalogPeople}  | 0
 share/html/{Elements/Assets => Asset/Elements}/EditRoleMembers        | 0
 share/html/{Elements/Assets => Asset/Elements}/Search                 | 0
 share/html/{Elements/Assets => Asset/Elements}/SelectRoleType         | 0
 share/html/Asset/ModifyPeople.html                                    | 4 ++--
 share/html/Elements/Tabs                                              | 2 +-
 8 files changed, 5 insertions(+), 5 deletions(-)
 rename share/html/{Elements/Assets/AddPeople => Asset/Elements/AddCatalogPeople} (100%)
 rename share/html/{Elements/Assets/EditPeople => Asset/Elements/EditCatalogPeople} (100%)
 rename share/html/{Elements/Assets => Asset/Elements}/EditRoleMembers (100%)
 rename share/html/{Elements/Assets => Asset/Elements}/Search (100%)
 rename share/html/{Elements/Assets => Asset/Elements}/SelectRoleType (100%)

- Log -----------------------------------------------------------------
commit dcee68733a9bc5409bff43ecb117b512c77fefad
Author: Todd Wade <todd at bestpractical.com>
Date:   Fri Oct 23 01:43:11 2015 -0400

    move contents of share/html/Elements/Assets to share/html/Asset/Elements

diff --git a/share/html/Admin/Assets/Catalogs/Roles.html b/share/html/Admin/Assets/Catalogs/Roles.html
index 075a792..7061aac 100644
--- a/share/html/Admin/Assets/Catalogs/Roles.html
+++ b/share/html/Admin/Assets/Catalogs/Roles.html
@@ -55,8 +55,8 @@
   <&| /Widgets/TitleBox, title => loc("Roles"), class => "catalog-roles" &>
     <table width="60%" class="edit">
       <tr>
-        <td><& /Elements/Assets/EditPeople, %ARGS, Object => $catalog &></td>
-        <td><& /Elements/Assets/AddPeople, Object => $catalog &></td>
+        <td><& /Asset/Elements/EditCatalogPeople, %ARGS, Object => $catalog &></td>
+        <td><& /Asset/Elements/AddCatalogPeople, Object => $catalog &></td>
       </tr>
     </table>
   </&>
diff --git a/share/html/Elements/Assets/AddPeople b/share/html/Asset/Elements/AddCatalogPeople
similarity index 100%
rename from share/html/Elements/Assets/AddPeople
rename to share/html/Asset/Elements/AddCatalogPeople
diff --git a/share/html/Elements/Assets/EditPeople b/share/html/Asset/Elements/EditCatalogPeople
similarity index 100%
rename from share/html/Elements/Assets/EditPeople
rename to share/html/Asset/Elements/EditCatalogPeople
diff --git a/share/html/Elements/Assets/EditRoleMembers b/share/html/Asset/Elements/EditRoleMembers
similarity index 100%
rename from share/html/Elements/Assets/EditRoleMembers
rename to share/html/Asset/Elements/EditRoleMembers
diff --git a/share/html/Elements/Assets/Search b/share/html/Asset/Elements/Search
similarity index 100%
rename from share/html/Elements/Assets/Search
rename to share/html/Asset/Elements/Search
diff --git a/share/html/Elements/Assets/SelectRoleType b/share/html/Asset/Elements/SelectRoleType
similarity index 100%
rename from share/html/Elements/Assets/SelectRoleType
rename to share/html/Asset/Elements/SelectRoleType
diff --git a/share/html/Asset/ModifyPeople.html b/share/html/Asset/ModifyPeople.html
index bb3b39f..5cf83f1 100644
--- a/share/html/Asset/ModifyPeople.html
+++ b/share/html/Asset/ModifyPeople.html
@@ -59,8 +59,8 @@
   <&| /Widgets/TitleBox, title => loc("People"), class => "asset-people", title_class => "inverse" &>
     <table width="100%" class="edit">
       <tr>
-        <td width="30%"><& /Elements/Assets/EditPeople, %ARGS, Object => $asset &></td>
-        <td width="30%"><& /Elements/Assets/AddPeople, Object => $asset &></td>
+        <td width="30%"><& /Asset/Elements/EditCatalogPeople, %ARGS, Object => $asset &></td>
+        <td width="30%"><& /Asset/Elements/AddCatalogPeople, Object => $asset &></td>
         <td>
           <& /Elements/EditCustomFields, Object => $asset, Grouping => 'People', AsTable => 1 &>
         </td>
diff --git a/share/html/Elements/Tabs b/share/html/Elements/Tabs
index d92d364..5fee73b 100644
--- a/share/html/Elements/Tabs
+++ b/share/html/Elements/Tabs
@@ -488,7 +488,7 @@ my $build_admin_menu = sub {
 my $build_main_nav = sub {
 
     if ($request_path =~ m{^/Asset/}) {
-        PageWidgets()->child( asset_search => raw_html => $m->scomp('/Elements/Assets/Search') );
+        PageWidgets()->child( asset_search => raw_html => $m->scomp('/Asset/Elements/Search') );
     } else {
         PageWidgets()->child( simple_search => raw_html => $m->scomp('SimpleSearch') );
         PageWidgets()->child( create_ticket => raw_html => $m->scomp('CreateTicket') );

-----------------------------------------------------------------------