Skip to content

Commit 6f0ad66

Browse files
author
RAJA MARAGANI
committed
removed unnecessary tags and formatted html page
1 parent b5e61f1 commit 6f0ad66

File tree

3 files changed

+58
-31
lines changed

3 files changed

+58
-31
lines changed

‎src/main/resources/static/css/sb-admin.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -508,4 +508,7 @@ footer.sticky-footer {
508508
}
509509
.divpad{
510510
padding-top: 10px;
511+
}
512+
.elementDiv{
513+
padding-bottom: 10px;
511514
}

‎src/main/resources/static/js/testrules.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,6 @@ jQuery(document).ready(
274274
sticky : false,
275275
theme : 'Notify'
276276
});
277-
console.log("I am ghere");
278277
var eventsList = JSON.parse(fileContent);
279278
ko.cleanNode($("#testEventsDOMObject")[0]);
280279
vm.eventsBindingList.removeAll();

‎src/main/resources/templates/testRules.html

Lines changed: 55 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@
1111
<body>
1212
<div class="hidden" id="frontendServiceUrl" style="display: none" th:text="${frontendServiceUrl}"></div>
1313
<div class="container pull-left" style="max-width: 100%; max-height: 100%">
14-
<br /> <br />
1514
<div align="center">
1615
<h1>Test Rules</h1>
1716
</div>
18-
<p><span style="color: #333333; background-color: #ffff00;">Upload Rules and events are in json list, Ex : [{},{}]</span></p>
19-
<div class="row" style="max-height: 950;padding: 10px" >
20-
<div class="col-6 border border-right border-success" id="testRulesDOMObject" style="padding: 10px" >
17+
<p>
18+
<span style="color: #333333; background-color: #ffff00;">Upload Rules and events are in json list, Ex
19+
: [{},{}]</span>
20+
</p>
21+
<div class="row" style="max-height: 950; padding: 10px">
22+
<div class="col-6 border border-right border-success" id="testRulesDOMObject" style="padding: 10px">
2123
<div class="row butt divpad">
2224
<div class="col-3">
2325
<button data-toggle="tooltip" title="Upload List of Rules" class="btn btn-primary upload_rules">
@@ -27,49 +29,73 @@ <h1>Test Rules</h1>
2729
</div>
2830
<div class="col-6">
2931
<button data-toggle="tooltip" title="Find the aggregated object" class="btn btn-primary"
30-
data-bind="click : $root.addRule.bind()">Add Rule<i class="fa fa-fw fa-plus"></i></button>
32+
data-bind="click : $root.addRule.bind()">
33+
Add Rule<i class="fa fa-fw fa-plus"></i>
34+
</button>
3135
</div>
3236
</div>
33-
<div class="row-fluid divpad"><h3>Rules</h3></div>
37+
<div class="row-fluid divpad">
38+
<h3>Rules</h3>
39+
</div>
3440
<div class="row-fluid rulesListDisplay" data-bind="foreach: rulesBindingList">
35-
<div class="testClass" data-bind="attr: { id: 'Rule' + $index() }">
36-
<div class="row-fluid">
37-
<textarea class="form-control formRules" rows="10"
38-
data-bind="text : $root.parsedToString($data)"></textarea>
39-
<span class="badge-danger" data-bind="click : $root.removeRule.bind()"><i class="fa fa-fw fa-trash"></i></span>
41+
<div class="elementDiv" data-bind="attr: { id: 'Rule' + $index() }">
42+
<div class="row">
43+
<div class="col-11">
44+
<textarea class="form-control formRules" rows="10"
45+
data-bind="text : $root.parsedToString($data)"></textarea>
46+
</div>
47+
<div class="col-1">
48+
<span class="badge-danger" data-bind="click : $root.removeRule.bind()"><i
49+
class="fa fa-fw fa-trash"></i></span>
50+
</div>
4051
</div>
4152
</div>
4253
</div>
4354
</div>
44-
<div class="col-6 border border-right border-success" id="testEventsDOMObject" style="max-height: 100%;padding: 10px">
55+
<div class="col-6 border border-right border-success" id="testEventsDOMObject"
56+
style="max-height: 100%; padding: 10px">
4557
<div class="row butt divpad">
4658
<div class="col-4">
47-
<button data-toggle="tooltip" title="Upload List of events" class="btn btn-primary upload_events">
59+
<button data-toggle="tooltip" title="Upload List of events"
60+
class="btn btn-primary upload_events">
4861
Upload Events <i class="fa fa-fw fa-upload"></i>
4962
</button>
5063
<input class="hidden" type='file' id='upload_rules_file' name='file' style="display: none" />
5164
</div>
5265
<div class="col-6">
5366
<button data-toggle="tooltip" title="Find the aggregated object" class="btn btn-primary"
54-
data-bind="click : $root.addEvent.bind()">Add Event<i class="fa fa-fw fa-plus"></i></button>
67+
data-bind="click : $root.addEvent.bind()">
68+
Add Event<i class="fa fa-fw fa-plus"></i>
69+
</button>
5570
</div>
5671
</div>
57-
<div class="row-fluid divpad" ><h3>Events</h3></div>
72+
<div class="row-fluid divpad">
73+
<h3>Events</h3>
74+
</div>
5875
<div class="row-fluid eventsListDisplay" data-bind="foreach: eventsBindingList">
59-
<div class="testClass" data-bind="attr: { id: 'Events' + $index() }">
60-
<div class="row-fluid">
61-
<textarea class="form-control formEvents" rows="10"
62-
data-bind="text : $root.parsedToString($data)"></textarea>
63-
<span class="badge-danger" data-bind="click : $root.removeEvent.bind()"><i class="fa fa-fw fa-trash"></i></span>
76+
<div class="elementDiv" data-bind="attr: { id: 'Events' + $index() }">
77+
<div class="row">
78+
<div class="col-11">
79+
<textarea class="form-control formEvents" rows="10"
80+
data-bind="text : $root.parsedToString($data)"></textarea>
81+
</div>
82+
<div class="col-1">
83+
<span class="badge-danger" data-bind="click : $root.removeEvent.bind()"><i
84+
class="fa fa-fw fa-trash"></i></span>
85+
</div>
6486
</div>
6587
</div>
6688
</div>
6789
</div>
6890
</div>
69-
<div class="row-fluid divpad" id="submitButton" >
91+
<div class="row-fluid divpad" id="submitButton">
7092
<div class="row">
71-
<div class="col-5"><button data-toggle="tooltip" title="download the above rules into a json file" class="btn btn-success download_rules"
72-
>Download Rules<i class="fa fa-fw fa-download"></i></button></div>
93+
<div class="col-5">
94+
<button data-toggle="tooltip" title="download the above rules into a json file"
95+
class="btn btn-success download_rules">
96+
Download Rules<i class="fa fa-fw fa-download"></i>
97+
</button>
98+
</div>
7399
<div class="col-2">
74100
<button data-toggle="tooltip" title="Find the aggregated object" class="btn btn-success"
75101
data-bind="click : $root.submit.bind($data)">Find Aggregated Object</button>
@@ -78,13 +104,12 @@ <h1>Test Rules</h1>
78104
</div>
79105
</div>
80106
<div style="display: none">
81-
<div id="aggregatedresult">
82-
<h1>
83-
<strong><span style="color: #0000ff;">Aggregated Object</span></strong>
84-
</h1>
85-
<pre id="aggregatedresultData"></pre>
107+
<div id="aggregatedresult">
108+
<h1>
109+
<strong><span style="color: #0000ff;">Aggregated Object</span></strong>
110+
</h1>
111+
<pre id="aggregatedresultData"></pre>
112+
</div>
86113
</div>
87-
</div >
88-
89114
</body>
90115
</html>

0 commit comments

Comments
 (0)