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

Allow remote access to Intu dashboard #10

Merged
merged 1 commit into from
Jul 15, 2017
Merged

Allow remote access to Intu dashboard #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion etc/shared/www/js/TopicClient.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ var TopicClient = (function () {
return {
getInstance: function() {
if(!instance) {
instance = createInstance('127.0.0.1', 9443);
instance = createInstance(location.hostname, location.port);
}

return instance;
Expand Down
4 changes: 2 additions & 2 deletions etc/shared/www/js/component/audio/audio.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<div draggable=true class="card">
<img class="card-img-top" src="http://localhost:9443/topics/fft" alt="Card image cap" style="width: 100%;max-height: 200px;">
<img class="card-img-top" src="../topics/fft" alt="Card image cap" style="width: 100%;max-height: 200px;">
<div class="card-block text-pane" style="height: 200px;">
<div class="conversation-wrapper" style="height: 80%;overflow-y: auto;">
<p class="card-text text-left" ng-repeat="text in $root.textObjects" ng-model="text">{{ text.transcription }}</p>
</div>
<a href="#image1" ng-click="$root.updateType('audio');"><img class="go-right" src="img/Icon_Expand.png" style="width: 20px;margin-top: 15px;"></a>
<!--<a href="" ng-click="$root.updateType('audio');"><img class="go-right" src="img/Icon_Expand.png" style="width: 20px;margin-top: 15px;"></a>-->
</div>
</div>
</div>
4 changes: 2 additions & 2 deletions etc/shared/www/js/component/camera/camera.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<div draggable="true" class="card" style="box-shadow:none;">
<img height=270 src="http://localhost:9443/topics/sensor-{{ cameraName }}" id="intu-camera" />
<img height=270 src="../topics/sensor-{{ cameraName }}" id="intu-camera" />
<div class="card-block text-pane" style="padding-top:10px;padding-bottom:10px;background-color: #E7EBEC;">
<select style="float:left;" ng-options="camera as camera.m_SensorName for camera in cameraParams" ng-model="item" ng-change="update();" ng-init="item = cameraParams[0]" ></select>
<a href="#image1" ng-click="$root.updateType('camera');"><img class="go-right" src="img/Icon_Expand.png" style="width: 20px;"></a>
<!--<a href="" ng-click="$root.updateType('camera');"><img class="go-right" src="img/Icon_Expand.png" style="width: 20px;"></a>-->
</div>
</div>
</div>
6 changes: 3 additions & 3 deletions etc/shared/www/js/partials/main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<span ng-if="$root.showFullScreen">
<div ng-switch="fullType">
<span ng-switch-when="camera">
<img style="width:75%;" src="http://localhost:9443/topics/sensor-Camera" />
<img style="width:75%;" src="../topics/sensor-Camera" />
</span>
<span ng-switch-when="audio">
<div class="card">
<img class="card-img-top" src="http://localhost:9443/topics/fft" alt="Card image cap" style="width: 100%; position:relative;">
<img class="card-img-top" src="../topics/fft" alt="Card image cap" style="width: 100%; position:relative;">
<div class="card-block text-pane" style="height: 500px;">
<div class="conversation-wrapper" style="overflow-y: auto;">
<p class="card-text text-left" ng-repeat="text in $root.textObjects" style="font-size:32px;">{{ text.transcription }}</p>
Expand Down Expand Up @@ -116,4 +116,4 @@
</pre>
<a class="close" href="" ng-click="$root.closedAdvanced();"></a>
</div>
</div>
</div>