Code Review
/
src
/
app-framework-demo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
|
inline
| side by side (parent:
3ebdce3
)
Cosmetic fixes
author
Fulup Ar Foll
<fulup@iot.bzh>
Mon, 25 Jan 2016 21:27:29 +0000
(22:27 +0100)
committer
Fulup Ar Foll
<fulup@iot.bzh>
Mon, 25 Jan 2016 21:27:29 +0000
(22:27 +0100)
afm-client/app/Frontend/pages/Dashboard/Dashboard.html
patch
|
blob
|
history
afm-client/app/Frontend/widgets/ActionButtons/AppliButton.js
patch
|
blob
|
history
afm-client/app/Frontend/widgets/FormInput/UploadAppli.js
patch
|
blob
|
history
diff --git
a/afm-client/app/Frontend/pages/Dashboard/Dashboard.html
b/afm-client/app/Frontend/pages/Dashboard/Dashboard.html
index
c393271
..
46dd60a
100644
(file)
--- a/
afm-client/app/Frontend/pages/Dashboard/Dashboard.html
+++ b/
afm-client/app/Frontend/pages/Dashboard/Dashboard.html
@@
-28,6
+28,6
@@
animationIn: slideInRight
</div>
</div>
-<
link-button href="sample" icon="fi-home" label="sample"></link-button
>
+<
!--<link-button href="sample" icon="fi-home" label="sample"></link-button>--
>
<token-refresh autolog="true" callback="ctrl.AutoStart"></token-refresh>
<token-refresh autolog="true" callback="ctrl.AutoStart"></token-refresh>
diff --git
a/afm-client/app/Frontend/widgets/ActionButtons/AppliButton.js
b/afm-client/app/Frontend/widgets/ActionButtons/AppliButton.js
index
387212e
..
50220dd
100644
(file)
--- a/
afm-client/app/Frontend/widgets/ActionButtons/AppliButton.js
+++ b/
afm-client/app/Frontend/widgets/ActionButtons/AppliButton.js
@@
-22,18
+22,18
@@
'use strict';
var tmplAppli = '<div ng-click="clicked()">' +
'use strict';
var tmplAppli = '<div ng-click="clicked()">' +
- '<img ng-src=
{{icon}}-ico.png
>' +
+ '<img ng-src=
"{{icon}}"
>' +
'<span>{{label}}</span>' +
'</div>';
var tmplModal =
'<b class="close-button" ng-click="close()">×</b>' +
'<span>{{label}}</span>' +
'</div>';
var tmplModal =
'<b class="close-button" ng-click="close()">×</b>' +
- '<img ng-src="{{
appicon}}-ico.png
">' +
- '<span class="modal-text">Application <b>{{
app
name}}</b></span>' +
+ '<img ng-src="{{
icon}}
">' +
+ '<span class="modal-text">Application <b>{{name}}</b></span>' +
'<ul class="vertical icon-left primary menu-bar">' +
'<li><a ng-click=action("start")><i class="fi-check"> Start</i></a></li>' +
'<ul class="vertical icon-left primary menu-bar">' +
'<li><a ng-click=action("start")><i class="fi-check"> Start</i></a></li>' +
- '<li><a
href="#"
><i class="fi-x"> Stop</i></a></li>' +
- '<li><a
href="#"
><i class="fi-info"> Info</i></a></li>' +
+ '<li><a
ng-click=action("stop")
><i class="fi-x"> Stop</i></a></li>' +
+ '<li><a
ng-click=action("info")
><i class="fi-info"> Info</i></a></li>' +
'</ul>' +
'';
'</ul>' +
'';
@@
-72,7
+72,10
@@
return;
}
return;
}
- // Application was stated
+ // Application was started
+ elem.addClass ("success");
+ elem.removeClass ("fail");
+ scope.runID = response.data.response.runid;
scope.callback (scope.appliID, "/api/afm-main/start", response);
});
break;
scope.callback (scope.appliID, "/api/afm-main/start", response);
});
break;
@@
-94,8
+97,8
@@
contentScope: {
action : actionModal,
close : closeModal,
contentScope: {
action : actionModal,
close : closeModal,
-
appicon
: scope.icon,
- appname : scope.label,
+
icon
: scope.icon,
+ label : scope.label
}, template : tmplModal
};
// Popup Modal to render application data
}, template : tmplModal
};
// Popup Modal to render application data
@@
-105,7
+108,7
@@
// extract application information from AppID+Store
if (attrs.handle && scope.store [attrs.handle].name) {
// extract application information from AppID+Store
if (attrs.handle && scope.store [attrs.handle].name) {
- scope.icon = AppConfig.paths.icons + scope.store [attrs.handle].name.toLowerCase();
+ scope.icon = AppConfig.paths.icons + scope.store [attrs.handle].name.toLowerCase()
+ '-ico.png'
;
scope.label = scope.store [attrs.handle].name;
scope.appliID= attrs.handle;
} else {
scope.label = scope.store [attrs.handle].name;
scope.appliID= attrs.handle;
} else {
diff --git
a/afm-client/app/Frontend/widgets/FormInput/UploadAppli.js
b/afm-client/app/Frontend/widgets/FormInput/UploadAppli.js
index
d18f620
..
c1b33ac
100644
(file)
--- a/
afm-client/app/Frontend/widgets/FormInput/UploadAppli.js
+++ b/
afm-client/app/Frontend/widgets/FormInput/UploadAppli.js
@@
-121,7
+121,6
@@
function LoadFileSvc (scope, files, fileCB) {
// if everything is OK let's add file to xform
xform.append(scope.name, this.file, this.file.name);
}
// if everything is OK let's add file to xform
xform.append(scope.name, this.file, this.file.name);
}
-
}
angular.module('UploadFiles',['AppConfig', 'ModalNotification', 'RangeSlider'])
}
angular.module('UploadFiles',['AppConfig', 'ModalNotification', 'RangeSlider'])