Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reactive web #84

Merged
merged 3 commits into from
Jul 18, 2015
Merged

Reactive web #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
143ad98
Web: render FULL mode only on demand (speed up interface)
commial Jul 12, 2015
fff1f56
Web: one-time-binding for ports summary
commial Jul 12, 2015
a8a2d6a
Web: reduce AngularJS watchers count in the full host view
commial Jul 12, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 0 additions & 4 deletions web/static/ivre/ivre.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,6 @@ form {
margin-bottom: 10px;
}

.result-hidden-part {
display: none;
}

.summary > table > tbody > tr > td {
padding-right: 10px;
white-space: nowrap;
Expand Down
14 changes: 7 additions & 7 deletions web/static/templates/subview-port-summary.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,20 @@

<a class="clickable"
ng-click="setparam(port.protocol + '/' + port.port)"
>{{port.protocol}}/{{port.port}}</a>
>{{::port.protocol}}/{{::port.port}}</a>
<span class="label label-status"
ng-class="class_from_port_status(port.state_state)">
{{port.state_state | uppercase}}
{{::port.state_state | uppercase}}
</span>
<span class="dtnormal" title="ttl: {{port.state_reason_ttl}}">
{{port.state_reason}}
<span class="dtnormal" title="ttl: {{::port.state_reason_ttl}}">
{{::port.state_reason}}
</span>
<span class="dtnormal result-url" title="URL">
<code>
{{url_from_port(port, host.addr)}}
{{::url_from_port(port, host.addr)}}
</code>
</span>
<img ng-if="port.screenshot == 'field'"
src="data:image/jpeg;base64,{{port.screendata}}"
src="data:image/jpeg;base64,{{::port.screendata}}"
class="screenshot"
alt="Screenshot for port {{port.port}}"/>
alt="Screenshot for port {{::port.port}}"/>
16 changes: 8 additions & 8 deletions web/static/templates/subview-ports-summary.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,24 @@
<tr ng-repeat="summary in host.port_summary | orderBy: 'status'">
<td>
<span>
{{summary.count}} port{{summary.count > 1 && "s" || ""}}
{{::summary.count}} port{{::summary.count > 1 && "s" || ""}}
</span>
</td>
<td>
<span class="label label-status"
ng-class="class_from_port_status(summary.status)">
{{short_port_status(summary.status) | uppercase}}
ng-class="class_from_port_status(summary.status)">
{{::short_port_status(summary.status) | uppercase}}
</span>
</td>
<td>
<span ng-if="summary.type == 'extra'"
ng-repeat="(reason, count) in summary.reasons">
{{count}} {{reason}}<span ng-if="!$last">, </span></span>
ng-repeat="(reason, count) in summary.reasons">
{{::count}} {{::reason}}<span ng-if="!$last">, </span></span>
<span ng-if="summary.type == 'ports'"
ng-repeat="port in summary.ports | orderBy: ['protocol','port']"
><!--
ng-repeat="port in summary.ports | orderBy: ['protocol','port']"
><!--
--><a ng-click="setparam(port.protocol+'/'+port.port)" class="clickable">
{{port.protocol}}/{{port.port}}</a><span ng-if="!$last">, </span>
{{::port.protocol}}/{{::port.port}}</a><span ng-if="!$last">, </span>
</span>
</td>
</tr>
Expand Down
16 changes: 8 additions & 8 deletions web/static/templates/subview-service-summary.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@
along with IVRE. If not, see <http://www.gnu.org/licenses/>.
-->

<span ng-attr-title="{{port.service_method}}"
>{{port.service_name}}</span><!--
<span ng-attr-title="{{::port.service_method}}"
>{{::port.service_name}}</span><!--
--><span ng-if="port.service_product"
>: {{port.service_product}}<!--
>: {{::port.service_product}}<!--
--><span ng-if="port.service_version"
>, {{port.service_version}}</span><!--
>, {{::port.service_version}}</span><!--
--></span>
<span ng-if="port.service_extrainfo"
>({{port.service_extrainfo}})</span>
>({{::port.service_extrainfo}})</span>
<span ng-if="port.service_hostname"
>(hostname: {{port.service_hostname}})</span>
>(hostname: {{::port.service_hostname}})</span>
<span ng-if="port.service_ostype"
>(ostype: {{port.service_ostype}})</span>
>(ostype: {{::port.service_ostype}})</span>
<span ng-if="port.service_tunnel"
>(tunnel: {{port.service_tunnel}})</span>
>(tunnel: {{::port.service_tunnel}})</span>
4 changes: 2 additions & 2 deletions web/static/templates/view-hosts.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
<div host-summary=""></div>
<!-- Next div is only displayed in summary mode-->
<div class="summary"
ng-class="{'result-hidden-part': host.fulldisplay}"
ng-hide="host.fulldisplay"
ports-summary=""></div>
<!-- Next div is only displayed in full mode-->
<div class="full"
ng-class="{'result-hidden-part': !host.fulldisplay}">
ng-if="host.fulldisplay">
<!-- extraports -->
<dd ng-repeat="(epstatus, epvalues) in host.extraports">
{{epvalues[0]}} port{{epvalues[0] > 1 && "s" || ""}}
Expand Down