From 443fff5a608e8c9f72ec11b3b08f425f89d0432d Mon Sep 17 00:00:00 2001
From: Sean Li <lishang106@gmail.com>
Date: Tue, 4 Nov 2014 15:25:47 -0500
Subject: [PATCH] Renamed app to container to be consistent with Docker
 concept.

---
 .../apps/dashboard-apps-settings.html         | 12 +++++------
 .../views/dashboard/apps/dashboard-apps.html  | 12 +++++------
 .../dashboard/apps/dashboard-single-app.html  | 20 +++++++++----------
 .../dashboard/components/dashboard-menu.html  |  2 +-
 .../components/modal-create-app.html          | 12 +++++------
 .../images/dashboard-single-image.html        |  2 +-
 .../layouts/dashboard-apps-layout.html        | 20 +++++++++----------
 .../layouts/dashboard-images-layout.html      |  2 +-
 .../settings/dashboard-settings.html          |  4 ++--
 9 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/meteor/client/views/dashboard/apps/dashboard-apps-settings.html b/meteor/client/views/dashboard/apps/dashboard-apps-settings.html
index 35acdf1dcb..6fc778b03c 100755
--- a/meteor/client/views/dashboard/apps/dashboard-apps-settings.html
+++ b/meteor/client/views/dashboard/apps/dashboard-apps-settings.html
@@ -1,8 +1,8 @@
 <template name="dashboard_apps_settings">
   <div class="section">
     <div class="left-section">
-      <h4>App Details</h4>
-      <p class="help-block">This section lists more information about this app.</p>
+      <h4>Container Details</h4>
+      <p class="help-block">This section lists more information about this container.</p>
     </div>
     <div class="right-section">
       <div class="row">
@@ -36,7 +36,7 @@
   <div class="section">
     <div class="left-section">
       <h4>Config Variables</h4>
-      <p class="help-block">You can update your app's environment variables here.</p>
+      <p class="help-block">You can update your container's environment variables here.</p>
     </div>
     <div class="right-section">
       <form class="form-env-vars wide">
@@ -71,11 +71,11 @@
   </div>
   <div class="section">
     <div class="left-section">
-      <h4>Delete App</h4>
-      <p class="help-block">Delete this app permanently.</p>
+      <h4>Delete Container</h4>
+      <p class="help-block">Delete this container permanently.</p>
     </div>
     <div class="right-section">
-      <a onclick="trackLink('delete app')" class="btn btn-negative btn-delete-app btn-sm">Delete App</a>
+      <a onclick="trackLink('delete container')" class="btn btn-negative btn-delete-app btn-sm">Delete Container</a>
     </div>
   </div>
 </template>
diff --git a/meteor/client/views/dashboard/apps/dashboard-apps.html b/meteor/client/views/dashboard/apps/dashboard-apps.html
index c0c154a705..eb9675bbf0 100755
--- a/meteor/client/views/dashboard/apps/dashboard-apps.html
+++ b/meteor/client/views/dashboard/apps/dashboard-apps.html
@@ -1,11 +1,11 @@
 <template name="dashboard_apps">
   <div class="header">
-    <h3>Apps</h3>
+    <h3>Containers</h3>
     <div class="options">
       {{#if $.Session.equals 'boot2dockerState' 'poweroff'}}
-        <a href="#" data-toggle="modal" data-target="#modal-create-app" class="btn btn-action" disabled="disabled"><span class="typcn typcn-plus-outline"></span> Create App</a>
+        <a href="#" data-toggle="modal" data-target="#modal-create-app" class="btn btn-action" disabled="disabled"><span class="typcn typcn-plus-outline"></span> Create Container</a>
       {{else}}
-        <a href="#" onclick="trackLink('create app')" data-toggle="modal" data-target="#modal-create-app" class="btn btn-action"><span class="typcn typcn-plus-outline"></span> Create App</a>
+        <a href="#" onclick="trackLink('create container')" data-toggle="modal" data-target="#modal-create-app" class="btn btn-action"><span class="typcn typcn-plus-outline"></span> Create Container</a>
       {{/if}}
     </div>
   </div>
@@ -20,11 +20,11 @@
       {{else}}
         <div class="empty-placeholder">
           <div class="big-icon"><i class="fa fa-cube"></i></div>
-          <h4>There are no apps yet.</h4>
+          <h4>There are no containers yet.</h4>
           {{#if $.Session.equals 'boot2dockerState' 'poweroff'}}
-            <a href="#" data-toggle="modal" data-target="#modal-create-app" class="btn btn-action" disabled="disabled"><span class="typcn typcn-plus-outline"></span> Create App</a>
+            <a href="#" data-toggle="modal" data-target="#modal-create-app" class="btn btn-action" disabled="disabled"><span class="typcn typcn-plus-outline"></span> Create Container</a>
           {{else}}
-            <a href="#" onclick="trackLink('create app')" data-toggle="modal" data-target="#modal-create-app" class="btn btn-action"><span class="typcn typcn-plus-outline"></span> Create App</a>
+            <a href="#" onclick="trackLink('create container')" data-toggle="modal" data-target="#modal-create-app" class="btn btn-action"><span class="typcn typcn-plus-outline"></span> Create Container</a>
           {{/if}}
         </div>
       {{/if}}
diff --git a/meteor/client/views/dashboard/apps/dashboard-single-app.html b/meteor/client/views/dashboard/apps/dashboard-single-app.html
index f0e34d0991..2b15227ec5 100755
--- a/meteor/client/views/dashboard/apps/dashboard-single-app.html
+++ b/meteor/client/views/dashboard/apps/dashboard-single-app.html
@@ -18,26 +18,26 @@
           {{/if}}
         {{/if}}
       {{/if}}
-      <a onclick="trackLink('app detail')" href="/apps/{{name}}" class="name">{{name}}</a>
-      <small><a onclick="trackLink('app image detail')" href="/images/{{image._id}}">{{displayTags image.tags}}</a></small>
+      <a onclick="trackLink('container detail')" href="/apps/{{name}}" class="name">{{name}}</a>
+      <small><a onclick="trackLink('container image detail')" href="/images/{{image._id}}">{{displayTags image.tags}}</a></small>
     </h5>
     <div class="options">
       {{#if $eq status 'READY'}}
         {{#if url}}
-          <a href="{{url}}" onclick="trackLink('view app')" class="btn-icon btn-view" target="_blank" data-toggle="tooltip" data-placement="bottom" title="View App"><span class="typcn typcn-eye-outline"></span></a>
+          <a href="{{url}}" onclick="trackLink('view container')" class="btn-icon btn-view" target="_blank" data-toggle="tooltip" data-placement="bottom" title="View"><span class="typcn typcn-eye-outline"></span></a>
         {{/if}}
-        <a href="#" onclick="trackLink('terminal into app')" class="btn-icon btn-terminal" data-toggle="tooltip" data-placement="bottom" title="Terminal"><span class="typcn typcn-device-laptop"></span></a>
+        <a href="#" onclick="trackLink('terminal into container')" class="btn-icon btn-terminal" data-toggle="tooltip" data-placement="bottom" title="Terminal"><span class="typcn typcn-device-laptop"></span></a>
       {{/if}}
-      <a href="#" onclick="trackLink('open app folder')" class="btn-icon btn-folder" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Folder"><span class="typcn typcn-folder-open"></span></a>
+      <a href="#" onclick="trackLink('open container folder')" class="btn-icon btn-folder" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Folder"><span class="typcn typcn-folder-open"></span></a>
       {{#if $eq status 'READY'}}
-        <a href="#" onclick="trackLink('stop app')" class="btn-icon btn-stop" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Stop App"><span class="typcn typcn-media-pause-outline"></span></a>
+        <a href="#" onclick="trackLink('stop container')" class="btn-icon btn-stop" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Stop"><span class="typcn typcn-media-pause-outline"></span></a>
       {{/if}}
       {{#if $eq status 'STOPPED'}}
-      <a href="#" onclick="trackLink('start app')" class="btn-icon btn-start" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Start App"><span class="typcn typcn-media-play-outline"></span></a>
+      <a href="#" onclick="trackLink('start container')" class="btn-icon btn-start" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Start"><span class="typcn typcn-media-play-outline"></span></a>
       {{/if}}
-      <a href="#" onclick="trackLink('restart app')" class="btn-icon btn-restart" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Restart"><span class="typcn typcn-refresh-outline"></span></a>
-      <a href="/apps/{{name}}/logs" onclick="trackLink('app logs')" class="btn-icon btn-logs" data-toggle="tooltip" data-placement="bottom" title="Logs"><span class="typcn typcn-document-text"></span></a>
-      <a href="/apps/{{name}}/settings" onclick="trackLink('app settings')" class="btn-icon" data-toggle="tooltip" data-placement="bottom" title="Settings"><span class="typcn typcn-cog-outline"></span></a>
+      <a href="#" onclick="trackLink('restart container')" class="btn-icon btn-restart" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Restart"><span class="typcn typcn-refresh-outline"></span></a>
+      <a href="/apps/{{name}}/logs" onclick="trackLink('container logs')" class="btn-icon btn-logs" data-toggle="tooltip" data-placement="bottom" title="Logs"><span class="typcn typcn-document-text"></span></a>
+      <a href="/apps/{{name}}/settings" onclick="trackLink('container settings')" class="btn-icon" data-toggle="tooltip" data-placement="bottom" title="Settings"><span class="typcn typcn-cog-outline"></span></a>
     </div>
   </div>
 </template>
diff --git a/meteor/client/views/dashboard/components/dashboard-menu.html b/meteor/client/views/dashboard/components/dashboard-menu.html
index 316f3cc9af..f1dc8640a6 100755
--- a/meteor/client/views/dashboard/components/dashboard-menu.html
+++ b/meteor/client/views/dashboard/components/dashboard-menu.html
@@ -6,7 +6,7 @@
       <div class="mac-maximize"><i class="fa fa-plus no-display"></i></div>
     </div>
     <ul class="nav nav-pills nav-stacked">
-      <li class="{{activeDashboardMenuItem 'apps'}}"><a onclick="trackLink('menu apps')" href="/apps" data-toggle="tooltip" data-placement="right" title="Apps"><i class="fa fa-cube"></i></a></li>
+      <li class="{{activeDashboardMenuItem 'apps'}}"><a onclick="trackLink('menu containers')" href="/apps" data-toggle="tooltip" data-placement="right" title="Containers"><i class="fa fa-cube"></i></a></li>
       <li class="{{activeDashboardMenuItem 'images'}}"><a onclick="trackLink('menu images')" href="/images" data-toggle="tooltip" data-placement="right" title="Images" style="margin-left: -2px;"><i class="fa fa-camera"></i></a></li>
       <li class="{{activeDashboardMenuItem 'settings'}}">
         <a onclick="trackLink('menu settings')" href="/settings" data-toggle="tooltip" data-placement="right" title="Settings" style="margin-left: 1px;"><i class="fa fa-gear"></i></a>
diff --git a/meteor/client/views/dashboard/components/modal-create-app.html b/meteor/client/views/dashboard/components/modal-create-app.html
index 61c4ec0014..c0fdf20c90 100755
--- a/meteor/client/views/dashboard/components/modal-create-app.html
+++ b/meteor/client/views/dashboard/components/modal-create-app.html
@@ -4,15 +4,15 @@
       <div class="modal-content">
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-          <h5 class="modal-title">Create App</h5>
+          <h5 class="modal-title">Create Container</h5>
         </div>
         <form id="form-create-app">
           <div class="modal-body">
             <div class="form-group">
-              <label>App Name</label>
+              <label>Container Name</label>
               <div class="right-inner-addon">
                 <i class="fa fa-cube"></i>
-                <input type="text" name="name" class="form-control" placeholder="my-application">
+                <input type="text" name="name" class="form-control" placeholder="my-container">
                 <p id="slug-create-app-name" class="help-block"></p>
               </div>
               {{#if hasItem images}}
@@ -38,7 +38,7 @@
                 </div>
               {{else}}
                 <div class="center space-top">
-                  <p class="text-muted">You don't have any images to create apps from.</p>
+                  <p class="text-muted">You don't have any images to create containers from.</p>
                   <a href="#" class="btn btn-sm btn-positive btn-create-image">Create Image</a>
                 </div>
               {{/if}}
@@ -47,9 +47,9 @@
           <div class="modal-footer">
             <button type="button" class="btn btn-sm btn-default" data-dismiss="modal">Close</button>
             {{#if hasItem images}}
-              <button onclick="trackLink('confirm create app')" type="submit" class="btn btn-sm btn-action">Create App</button>
+              <button onclick="trackLink('confirm create app')" type="submit" class="btn btn-sm btn-action">Create Container</button>
             {{else}}
-              <button type="submit" class="btn btn-sm btn-action" disabled="disabled">Create App</button>
+              <button type="submit" class="btn btn-sm btn-action" disabled="disabled">Create Container</button>
             {{/if}}
           </div>
         </form>
diff --git a/meteor/client/views/dashboard/images/dashboard-single-image.html b/meteor/client/views/dashboard/images/dashboard-single-image.html
index b2e39d6a23..826c3fb465 100755
--- a/meteor/client/views/dashboard/images/dashboard-single-image.html
+++ b/meteor/client/views/dashboard/images/dashboard-single-image.html
@@ -28,7 +28,7 @@
     <div class="options">
       {{#if $eq status 'READY'}}
         {{#if hasExposedPort}}
-          <a onclick="trackLink('create app from image')" href="#" class="btn-icon btn-create-app" data-toggle="tooltip" data-placement="bottom" title="Create App"><span class="typcn typcn-plus-outline"></span></a>
+          <a onclick="trackLink('create container from image')" href="#" class="btn-icon btn-create-app" data-toggle="tooltip" data-placement="bottom" title="Create Container"><span class="typcn typcn-plus-outline"></span></a>
         {{/if}}
       {{/if}}
       {{#if originPath}}
diff --git a/meteor/client/views/dashboard/layouts/dashboard-apps-layout.html b/meteor/client/views/dashboard/layouts/dashboard-apps-layout.html
index 0ac0bd2745..092eb64822 100755
--- a/meteor/client/views/dashboard/layouts/dashboard-apps-layout.html
+++ b/meteor/client/views/dashboard/layouts/dashboard-apps-layout.html
@@ -9,30 +9,30 @@
           {{> menu_header}}
           <div class="header">
             <h3>
-              <a href="/apps" onclick="trackLink('back to apps')">Apps</a> &raquo; {{this.name}}
+              <a href="/apps" onclick="trackLink('back to containers')">Containers</a> &raquo; {{this.name}}
               <span class="icons">
                 {{#if $eq status 'READY'}}
                   {{#if url}}
-                    <a onclick="trackLink('view app')" href="{{url}}" class="btn-view" target="_blank" data-toggle="tooltip" data-placement="bottom" title="View App" data-container="body"><span class="typcn typcn-eye-outline"></span></a>
+                    <a onclick="trackLink('view container')" href="{{url}}" class="btn-view" target="_blank" data-toggle="tooltip" data-placement="bottom" title="View" data-container="body"><span class="typcn typcn-eye-outline"></span></a>
                   {{/if}}
-                  <a onclick="trackLink('terminal into app')" href="#" class="btn-terminal" data-toggle="tooltip" data-placement="bottom" title="Terminal" data-container="body"><span class="typcn typcn-device-laptop"></span></a>
+                  <a onclick="trackLink('terminal into container')" href="#" class="btn-terminal" data-toggle="tooltip" data-placement="bottom" title="Terminal" data-container="body"><span class="typcn typcn-device-laptop"></span></a>
                   {{#if image}}
-                    <a onclick="trackLink('go to app image')" href="/images/{{image._id}}" class="btn-image" data-toggle="tooltip" data-placement="bottom" title="Image" data-container="body"><span class="typcn typcn-camera-outline"></span></a>
+                    <a onclick="trackLink('go to container image')" href="/images/{{image._id}}" class="btn-image" data-toggle="tooltip" data-placement="bottom" title="Image" data-container="body"><span class="typcn typcn-camera-outline"></span></a>
                   {{/if}}
                 {{/if}}
-                <a onclick="trackLink('open app folder')" href="#" class="btn-folder" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Folder" data-container="body"><span class="typcn typcn-folder-open"></span></a>
+                <a onclick="trackLink('open container folder')" href="#" class="btn-folder" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Folder" data-container="body"><span class="typcn typcn-folder-open"></span></a>
                 {{#if $eq status 'READY'}}
-                  <a href="#" onclick="trackLink('stop app')" class="btn-icon btn-stop" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Stop App"><span class="typcn typcn-media-pause-outline"></span></a>
+                  <a href="#" onclick="trackLink('stop container')" class="btn-icon btn-stop" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Stop"><span class="typcn typcn-media-pause-outline"></span></a>
                 {{/if}}
                 {{#if $eq status 'STOPPED'}}
-                <a href="#" onclick="trackLink('start app')" class="btn-icon btn-start" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Start App"><span class="typcn typcn-media-play-outline"></span></a>
+                <a href="#" onclick="trackLink('start container')" class="btn-icon btn-start" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Start"><span class="typcn typcn-media-play-outline"></span></a>
                 {{/if}}
-                <a onclick="trackLink('restart app')" href="#" class="btn-restart" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Restart" data-container="body"><span class="typcn typcn-refresh-outline"></span></a>
+                <a onclick="trackLink('restart container')" href="#" class="btn-restart" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Restart" data-container="body"><span class="typcn typcn-refresh-outline"></span></a>
               </span>
             </h3>
             <div class="options">
-              <a onclick="trackLink('app logs')" href="/apps/{{this.name}}/logs" class=" btn btn-action {{activeDashboardSubMenuItem 'logs'}} btn-logs"><span class="typcn typcn-document-text"></span> Logs</a>
-              <a onclick="trackLink('app settings')" href="/apps/{{this.name}}/settings" class="btn btn-action {{activeDashboardSubMenuItem 'settings'}}"><span class="typcn typcn-cog-outline"></span> Settings</a>
+              <a onclick="trackLink('container logs')" href="/apps/{{this.name}}/logs" class=" btn btn-action {{activeDashboardSubMenuItem 'logs'}} btn-logs"><span class="typcn typcn-document-text"></span> Logs</a>
+              <a onclick="trackLink('container settings')" href="/apps/{{this.name}}/settings" class="btn btn-action {{activeDashboardSubMenuItem 'settings'}}"><span class="typcn typcn-cog-outline"></span> Settings</a>
             </div>
           </div>
           <div class="content">
diff --git a/meteor/client/views/dashboard/layouts/dashboard-images-layout.html b/meteor/client/views/dashboard/layouts/dashboard-images-layout.html
index bbe9fd9438..d7743e29cc 100755
--- a/meteor/client/views/dashboard/layouts/dashboard-images-layout.html
+++ b/meteor/client/views/dashboard/layouts/dashboard-images-layout.html
@@ -13,7 +13,7 @@
               <span class="icons">
                 {{#if $eq status 'READY'}}
                   {{#if hasExposedPort}}
-                    <a onclick="trackLink('create app from image')" href="#" class="btn-create-app" data-toggle="tooltip" data-placement="bottom" title="Create App" data-container="body"><span class="typcn typcn-plus-outline"></span></a>
+                    <a onclick="trackLink('create container from image')" href="#" class="btn-create-app" data-toggle="tooltip" data-placement="bottom" title="Create Container" data-container="body"><span class="typcn typcn-plus-outline"></span></a>
                   {{/if}}
                 {{/if}}
                 {{#if originPath}}
diff --git a/meteor/client/views/dashboard/settings/dashboard-settings.html b/meteor/client/views/dashboard/settings/dashboard-settings.html
index 6af4cccf75..8d7383752a 100644
--- a/meteor/client/views/dashboard/settings/dashboard-settings.html
+++ b/meteor/client/views/dashboard/settings/dashboard-settings.html
@@ -8,7 +8,7 @@
       {{#if $.Session.equals 'boot2dockerState' 'poweroff'}}
         <p class="help-block error">Please start Boot2Docker for Kitematic to work properly!</p>
       {{else}}
-        <p class="help-block">All apps run in a Linux VM included with Kitematic. It needs to be turned on to run apps.</p>
+        <p class="help-block">All containers run in a Linux VM included with Kitematic. It needs to be turned on to run containers.</p>
       {{/if}}
     </div>
     <div class="right-section">
@@ -55,7 +55,7 @@
   <div class="section dashboard-settings">
     <div class="left-section">
       <h4>Repair Kitematic</h4>
-      <p class="help-block">You can repair Kitematic installation if the app stops working properly.</p>
+      <p class="help-block">You can repair Kitematic installation if the container stops working properly.</p>
     </div>
     <div class="right-section">
       <a onclick="trackLink('repair kitematic')" class="btn btn-negative btn-repair">Repair Kitematic</a>