Skip to content

Commit 13f368a

Browse files
vertigo17vertigo17
committed
Improve UX on buttons between script page and execution page.
1 parent 8816395 commit 13f368a

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

‎source/src/main/webapp/TestCaseExecution.jsp

+8-8
Original file line numberDiff line numberDiff line change
@@ -171,32 +171,32 @@
171171
</div>
172172
<div class="btn-group ">
173173
<a>
174-
<button class="btn btn-default" id="editTcHeader"
175-
style="margin-left: 5px; margin-left: 5px;">
176-
<span class="glyphicon glyphicon-pencil"></span> Edit Test Case Header
174+
<button class="btn btn-default" id="editTcStepInfo"
175+
style="margin-left: 5px;">
176+
<span class="glyphicon glyphicon-pencil"></span> Edit Test Case from the current Step
177177
</button>
178178
</a>
179179
</div>
180180
<div class="btn-group ">
181181
<a>
182-
<button class="btn btn-default" id="editTcStepInfo"
183-
style="margin-left: 5px; margin-left: 5px;">
184-
<span class="glyphicon glyphicon-new-window"></span> Edit Test Case from the current Step
182+
<button class="btn btn-default" id="editTcHeader"
183+
style="margin-left: 5px; margin-right: 5px;">
184+
<span class="glyphicon glyphicon-edit"></span> Edit Test Case Header
185185
</button>
186186
</a>
187187
</div>
188188
<div class="btn-group" id="runTestCasePopover">
189189
<a>
190190
<button class="btn btn-default pull-right" id="runTestCase"
191-
style="margin-left: 5px; margin-left: 5px;" data-toggle="tooltip">
191+
style="margin-left: 5px;" data-toggle="tooltip">
192192
<span class="glyphicon glyphicon-play"></span>
193193
</button>
194194
</a>
195195
</div>
196196
<div class="btn-group">
197197
<a>
198198
<button class="btn btn-default pull-right" id="rerunFromQueueandSee"
199-
style="margin-left: 5px; margin-left: 5px;">
199+
style="margin-left: 5px;">
200200
<span class="glyphicon glyphicon-forward"></span>
201201
</button>
202202
</a>

‎source/src/main/webapp/TestCaseScript.jsp

+4-4
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,11 @@
9595
<a><button class="btn btn-default pull-left" id="seeLogs" style="margin-left: 5px; margin-right: 5px;"><span class="glyphicon glyphicon-list"></span> Logs</button></a>
9696
</div>
9797
</div>
98-
<div class="btn-group ">
99-
<a><button class="btn btn-default pull-right" id="editTcInfo">Edit Test Case Header</button></a>
100-
</div>
10198
<div class="btn-group">
102-
<a><button class="btn btn-default pull-left" id="seeLastExecUniq" style="margin-left: 5px; margin-right: 5px;"><span class="glyphicon glyphicon-saved"></span></button></a>
99+
<a><button class="btn btn-default pull-left" id="seeLastExecUniq"><span class="glyphicon glyphicon-cog"></span> Last Exe</button></a>
100+
</div>
101+
<div class="btn-group ">
102+
<a><button class="btn btn-default pull-right" id="editTcInfo" style="margin-left: 5px; margin-right: 5px;"><span class="glyphicon glyphicon-edit"></span> Test Case Header</button></a>
103103
</div>
104104
<div class="btn-group" id="runTestCasePopover">
105105
<a><button class="btn btn-default pull-right" id="runTestCase" style="margin-left: 5px; margin-left: 5px;" data-toggle="tooltip" ><span class="glyphicon glyphicon-play"></span></button></a>

‎source/src/main/webapp/js/pages/TestCaseExecution.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -397,8 +397,8 @@ function displayPageLabel(doc) {
397397
$("#rerunFromQueue").html("<span class='glyphicon glyphicon-forward'></span> " + doc.getDocLabel("page_executiondetail", "reruntcqueue"));
398398
$("#rerunFromQueueandSee").html("<span class='glyphicon glyphicon-forward'></span> " + doc.getDocLabel("page_executiondetail", "reruntcqueueandsee"));
399399
$("#editTcInfo").html("<span class='glyphicon glyphicon-new-window'></span> " + doc.getDocLabel("page_executiondetail", "edittc"));
400-
$("#editTcHeader").html("<span class='glyphicon glyphicon-pencil'></span> " + doc.getDocLabel("page_executiondetail", "edittch"));
401-
$("#editTcStepInfo").html("<span class='glyphicon glyphicon-new-window'></span> " + doc.getDocLabel("page_executiondetail", "edittcstep"));
400+
$("#editTcHeader").html("<span class='glyphicon glyphicon-edit'></span> " + doc.getDocLabel("page_executiondetail", "edittch"));
401+
$("#editTcStepInfo").html("<span class='glyphicon glyphicon-pencil'></span> " + doc.getDocLabel("page_executiondetail", "edittcstep"));
402402
$("#saveTestCaseExecution").html("<span class='glyphicon glyphicon-save'></span> " + doc.getDocLabel("page_executiondetail", "save"));
403403

404404
$("#ns1Label").text(doc.getDocLabel("page_executiondetail", "ns1"));

‎source/src/main/webapp/js/pages/TestCaseScript.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -464,14 +464,14 @@ function displayPageLabel(doc) {
464464

465465
// CONTEXT MENU
466466
$("#btnGroupDrop1").html("<span class='glyphicon glyphicon-option-horizontal'></span>");
467-
$("#seeLastExecUniq").attr('data-toggle', 'tooltip').attr('data-original-title', doc.getDocDescription("page_testcasescript", "see_lastexecuniq")).html("<span class='glyphicon glyphicon-saved'></span> " + doc.getDocLabel('page_testcasescript', 'see_lastexecuniq'));
467+
$("#seeLastExecUniq").attr('data-toggle', 'tooltip').attr('data-original-title', doc.getDocDescription("page_testcasescript", "see_lastexecuniq")).html("<span class='glyphicon glyphicon-cog'></span> " + doc.getDocLabel('page_testcasescript', 'see_lastexecuniq'));
468468
$("#seeLastExec").attr('data-toggle', 'tooltip').attr('data-original-title', doc.getDocDescription("page_testcasescript", "see_lastexec")).html("<span class='glyphicon glyphicon-list'></span> " + doc.getDocLabel("page_testcasescript", "see_lastexec"));
469469
$("#seeTest").attr('data-toggle', 'tooltip').attr('data-original-title', doc.getDocDescription("page_testcasescript", "see_test")).html("<span class='glyphicon glyphicon-list'></span> " + doc.getDocLabel("page_testcasescript", "see_test"));
470470
$("#seeLogs").attr('data-toggle', 'tooltip').attr('data-original-title', doc.getDocDescription("page_testcasescript", "see_logs")).html("<span class='glyphicon glyphicon-list'></span> " + doc.getDocLabel("page_testcasescript", "see_logs"));
471471
$("#btnGroupDrop2").html(doc.getDocLabel("page_testcasescript", "run") + " <span class='caret'></span>");
472472
$("#runTestCase").attr('data-toggle', 'tooltip').attr('data-original-title', doc.getDocDescription("page_testcasescript", "run_testcase")).html("<span class='glyphicon glyphicon-play'></span> " + doc.getDocLabel("page_testcasescript", "run_testcase"));
473473
$("#rerunFromQueueandSee").attr('data-toggle', 'tooltip').attr('data-original-title', doc.getDocDescription("page_testcasescript", "rerunqueueandsee_testcase")).html("<span class='glyphicon glyphicon-forward'></span> " + doc.getDocLabel("page_testcasescript", "rerunqueueandsee_testcase"));
474-
$("#editTcInfo").attr('data-toggle', 'tooltip').attr('data-original-title', doc.getDocDescription("page_testcasescript", "edit_testcase")).html("<span class='glyphicon glyphicon-pencil'></span> " + doc.getDocLabel("page_testcasescript", "edit_testcase"));
474+
$("#editTcInfo").attr('data-toggle', 'tooltip').attr('data-original-title', doc.getDocDescription("page_testcasescript", "edit_testcase")).html("<span class='glyphicon glyphicon-edit'></span> " + doc.getDocLabel("page_testcasescript", "edit_testcase"));
475475
$("#saveScript").attr('data-toggle', 'tooltip').attr('data-original-title', doc.getDocDescription("page_testcasescript", "save_script")).html("<span class='glyphicon glyphicon-floppy-disk'></span> " + doc.getDocLabel("page_testcasescript", "save_script"));
476476
$("#saveScriptAs").attr('data-toggle', 'tooltip').attr('data-original-title', doc.getDocDescription("page_testcasescript", "saveas_script")).html("<span class='glyphicon glyphicon-floppy-disk'></span> " + doc.getDocLabel("page_testcasescript", "saveas_script"));
477477
$("#deleteTestCase").attr('data-toggle', 'tooltip').attr('data-original-title', doc.getDocDescription("page_testcasescript", "delete")).html("<span class='glyphicon glyphicon-trash'></span> " + doc.getDocLabel("page_testcasescript", "delete"));

0 commit comments

Comments
 (0)