Skip to content

Commit

Permalink
Rockon pre & post-install summaries are inconsistent rockstor#2904
Browse files Browse the repository at this point in the history
Clarify header and mouse-over text in both associated tables.
Normalise on column order (as per header) as per existing pre-install
summary table.

Includes:
- Bug fix re some internal/external header-to-contents columns
swapped.
- Incidental bugfix re empty internal (to Rock-on) device cell
entries.
  • Loading branch information
phillxnet committed Oct 4, 2024
1 parent bbb4720 commit f2d1645
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@
<table class="table table-condensed table-bordered table-hover table-striped tablesorter">
<thead>
<tr>
<th>Resource type&nbsp;&nbsp<i class="fa fa-info-circle fa-lg" title="Type of the system resource on Rockstor. Eg: Share, port numbers etc.. Custom type is for arbitrary variables needed by the Rock-on that may not map to a system resource." rel="tooltip"></i></th>
<th>Name&nbsp;&nbsp<i class="fa fa-info-circle fa-lg" title="Name of the resource according to Rockstor. Eg: Share names, port numbers etc.." rel="tooltip"></i></th>
<th>Mapped representation&nbsp;&nbsp<i class="fa fa-info-circle fa-lg" title="Name/representation of the resource inside the Rock-on. Eg: Shares map to directories, ports map to (possibly different)ports to send traffic to the Rock-on, etc.." rel="tooltip"></i></th>
<th>Resource type&nbsp;&nbsp<i class="fa fa-info-circle fa-lg" title="Eg: Share, Port, Environmental variable etc. Custom type is for arbitrary variables needed by the Rock-on that may not map to an external resource." rel="tooltip"></i></th>
<th>Internal Reference&nbsp;&nbsp<i class="fa fa-info-circle fa-lg" title="Resource reference from inside the Rock-on/docker-containers. E.g.: internal directories, internal port numbers, Environmental variable names, etc.." rel="tooltip"></i></th>
<th>External Reference / Configured value&nbsp;&nbsp<i class="fa fa-info-circle fa-lg" title="Rockstor's reference for the given resource. E.g.: mapped Share, external Port, Environment variable value configured, etc.." rel="tooltip"></i></th>
</tr>
</thead>
{{#each volumes}}
<tr>
<td>Share</td>
<td>{{this.share_name}}</td>
<td>{{this.dest_dir}}</td>
<td>{{this.share_name}}</td>
</tr>
{{/each}}
{{display_newVolumes}}
{{#each ports}}
<tr>
<td>Port</td>
<td>{{this.hostp}}</td>
<td>{{this.containerp}}{{isPublished this.id this.publish}}</td>
<td>{{this.hostp}}</td>
<!--<td>{{this.containerp}}{{isPublished this.id}}</td>-->
</tr>
{{/each}}
Expand All @@ -29,30 +29,30 @@
{{#each rocknets}}
<tr>
<td>Network</td>
<td>{{this.container_name}}</td>
<td>{{this.docker_name}}</td>
<td>{{this.container_name}}</td>
</tr>
{{/each}}
{{/if}}
{{#each cc}}
<tr>
<td>Custom</td>
<td>{{this.val}}&nbsp;&nbsp<i class="fa fa-info-circle" title="{{this.description}}" rel="tooltip"></i></td>
<td>{{this.key}}</td>
<td>{{this.val}}&nbsp;&nbsp<i class="fa fa-info-circle" title="{{this.description}}" rel="tooltip"></i></td>
</tr>
{{/each}}
{{#each device}}
<tr>
<td>Device</td>
<td>{{this.val}}&nbsp;&nbsp<i class="fa fa-info-circle" title="{{this.description}}" rel="tooltip"></i></td>
<td>{{this.dev}}</td>
<td>{{this.val}}&nbsp;&nbsp<i class="fa fa-info-circle" title="{{this.description}}" rel="tooltip"></i></td>
</tr>
{{/each}}
{{#each env}}
<tr>
<td>Env</td>
<td>{{this.val}}&nbsp;&nbsp<i class="fa fa-info-circle" title="{{this.description}}" rel="tooltip"></i></td>
<td>{{this.key}}</td>
<td>{{this.val}}&nbsp;&nbsp<i class="fa fa-info-circle" title="{{this.description}}" rel="tooltip"></i></td>
</tr>
{{/each}}
{{#each labels}}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<table class="table table-condensed table-bordered table-hover table-striped tablesorter">
<thead>
<tr>
<th>Resource type&nbsp;&nbsp<i class="fa fa-info-circle fa-lg" title="Type of the system resource on Rockstor. Eg: Share, port numbers etc.. Custom type is for arbitrary variables needed by the Rock-on that may not map to a system resource." rel="tooltip"></i></th>
<th>Name&nbsp;&nbsp<i class="fa fa-info-circle fa-lg" title="Name of the resource according to Rockstor. Eg: Share names, port numbers etc.." rel="tooltip"></i></th>
<th>Mapped representation&nbsp;&nbsp<i class="fa fa-info-circle fa-lg" title="Name/representation of the resource inside the Rock-on. Eg: Shares map to directories, ports map to (possibly different)ports to send traffic to the Rock-on, etc.." rel="tooltip"></i></th>
<th>Resource type&nbsp;&nbsp<i class="fa fa-info-circle fa-lg" title="Eg: Share, Port, Environmental variable etc. Custom type is for arbitrary variables needed by the Rock-on that may not map to an external resource." rel="tooltip"></i></th>
<th>Internal Reference&nbsp;&nbsp<i class="fa fa-info-circle fa-lg" title="Resource reference from inside the Rock-on/docker-containers. E.g.: internal directories, internal port numbers, Environmental variable names, etc.." rel="tooltip"></i></th>
<th>External Reference / Configured value&nbsp;&nbsp<i class="fa fa-info-circle fa-lg" title="Rockstor's reference for the given resource. E.g.: mapped Share, external Port, Environment variable value configured, etc.." rel="tooltip"></i></th>
</tr>
</thead>
{{#each share_map}}
<tr>
<td>Share</td>
<td>{{@key}}</td>
<td>{{this}}</td>
<td>{{@key}}</td>
</tr>
{{/each}}
{{#each port_map}}
<tr>
<td>Port</td>
<td>{{@key}}</td>
<td>{{this}}</td>
<td>{{@key}}</td>
</tr>
{{/each}}
{{#each cc_map}}
Expand All @@ -30,7 +30,7 @@
{{#each dev_map}}
<tr>
<td>Device</td>
<td>{{@dev}}</td>
<td>{{@key}}</td>
<td>{{this}}</td>
</tr>
{{/each}}
Expand Down

0 comments on commit f2d1645

Please sign in to comment.