Skip to content

Commit fb06d00

Browse files
committed
update configuration ui.
1 parent 3b91d88 commit fb06d00

File tree

4 files changed

+18
-6
lines changed

4 files changed

+18
-6
lines changed

‎web/src/main/webapp/features/configuration/application/alarm-rule.directive.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
var $element = $(element);
2020
var $elGuide = $element.find(".some-guide");
2121
var $elWrapper = $element.find(".wrapper");
22-
var $elTotal = $element.find(".total");
2322
var $elLoading = $element.find(".some-loading");
2423
var aEditNodes = [ $element.find("tr._edit1"), $element.find("tr._edit2") ];
2524
var $elAlert = $element.find(".some-alert");
@@ -52,7 +51,6 @@
5251
bIsLoaded = true;
5352
oRuleList = oServerData;
5453
scope.ruleList = oServerData;
55-
AlarmUtilService.setTotal( $elTotal, oRuleList.length );
5654
AlarmUtilService.hide( $elLoading );
5755
}, showAlert );
5856
}
@@ -156,7 +154,6 @@
156154
oRuleList.push( oNewRule );
157155
scope.ruleList = oRuleList;
158156
hideEditArea();
159-
AlarmUtilService.setTotal( $elTotal, oRuleList.length );
160157
}, showAlert );
161158
};
162159
scope.onCancelAddAlarm = function() {
@@ -184,7 +181,6 @@
184181
scope.$apply(function() {
185182
scope.ruleList = oRuleList;
186183
});
187-
AlarmUtilService.setTotal( $elTotal, oRuleList.length );
188184
}, showAlert );
189185
};
190186
scope.onUpdateAlarm = function( $event ) {

‎web/src/main/webapp/features/configuration/application/alarmRule.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="some-list some-table" style="width:615px;">
22
<div class="some-list-header" style="background-color:#9A9A9A;color:#FFF;">
3-
<span class="title">Alarm Rules<span class="total"></span></span>
3+
<span class="title">Alarm</span>
44
<span class="right" style="text-decoration: underline;cursor:pointer;margin-right:6px;" ng-click="onAddAlarm()">+ Add</span>
55
</div>
66
<div class="some-list-content">

‎web/src/main/webapp/features/configuration/application/applicationGroup.html‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
<div class="application-group">
2+
<div class="title">
3+
<span>Application</span>
4+
</div>
25
<div class="filtering">
36
<input type="input" class="form-control" ng-model="applicationFilter" placeholder="찾으려는 application 을 입력하세요"/>
47
</div>

‎web/src/main/webapp/styles/configuration.css‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,19 @@
303303
border: 1px solid #E2E2E2;
304304
background-color: #FFF;
305305
}
306+
#application-config .application-group .title {
307+
width: 100%;
308+
height: 41px;
309+
padding: 10px 10px 0px 10px;
310+
position: relative;
311+
border-bottom: 1px solid #E2E2E2;
312+
background-color: #9A9A9A;
313+
}
314+
#application-config .application-group .title span {
315+
color: #FFF;
316+
font-size: 16px;
317+
}
318+
306319
#application-config .application-group .filtering {
307320
width: 100%;
308321
height: 41px;
@@ -313,7 +326,7 @@
313326
}
314327
#application-config .application-group .wrapper {
315328
width: 100%;
316-
height: 457px;
329+
height: 416px;
317330
position: relative;
318331
overflow-y: auto;
319332
}

0 commit comments

Comments
 (0)