Skip to content

Commit 6e92ea0

Browse files
mtierltdmtierltd
authored
Merge pull request #154 from Thomas131/html-intention-PR
Format HTML in a pleasing way
2 parents 8cf5620 + 5a58ed1 commit 6e92ea0

File tree

9 files changed

+420
-420
lines changed

9 files changed

+420
-420
lines changed

‎templates/content/clients.php‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
<div id="timetracker-clients">
2-
<h1 class='page-title'>Clients</h1>
3-
<div id="client-input-container" class='center'>
2+
<h1 class='page-title'>Clients</h1>
3+
<div id="client-input-container" class='center'>
44
<form>
55
<input tabindex="1" type="text" spellcheck="false" autocomplete="off" class="" value="" placeholder="New client name..." id="new-client-input">
66
<input type="submit" value="Add client" id="new-client-submit" class="ui-button primary">
77
</form>
8-
</div>
9-
<div id="dialog-confirm" title="Confirmation Required" class='hidden'>
10-
Are you sure you want to delete this client?
11-
</div>
12-
<div id="dialog-client-edit-form" title="Edit client" class='hidden'>
13-
<p class="validateTips">All form fields are required.</p>
14-
15-
<form>
16-
<fieldset>
17-
<label for="name">Name</label>
18-
<input type="text" name="name" id="name" value="" class="text ui-widget-content ui-corner-all">
19-
20-
<!-- Allow form submission with keyboard without duplicating the dialog button -->
21-
<input type="submit" tabindex="-1" style="position:absolute; top:-1000px">
22-
</fieldset>
23-
</form>
24-
</div>
25-
<div class="clearfix"> </div>
26-
<div id="clients">
27-
</div>
8+
</div>
9+
<div id="dialog-confirm" title="Confirmation Required" class='hidden'>
10+
Are you sure you want to delete this client?
11+
</div>
12+
<div id="dialog-client-edit-form" title="Edit client" class='hidden'>
13+
<p class="validateTips">All form fields are required.</p>
14+
15+
<form>
16+
<fieldset>
17+
<label for="name">Name</label>
18+
<input type="text" name="name" id="name" value="" class="text ui-widget-content ui-corner-all">
19+
20+
<!-- Allow form submission with keyboard without duplicating the dialog button -->
21+
<input type="submit" tabindex="-1" style="position:absolute; top:-1000px">
22+
</fieldset>
23+
</form>
24+
</div>
25+
<div class="clearfix"> </div>
26+
<div id="clients">
27+
</div>
2828
</div>

‎templates/content/dashboard.php‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
1-
21
<div id="timetracker-dashboard" class='theme-white'>
3-
<h1 class='page-title'>Dashboard</h1>
2+
<h1 class='page-title'>Dashboard</h1>
43
54
6-
<div class="clearfix"> </div>
7-
<div id="dashboard">
8-
<div>
9-
<h1>Time (in minutes) allocated to each client in the last days</h1>
105
<div class="clearfix"> </div>
11-
<br/>
12-
<div class="time-controls">
13-
<div id="report-range" style="cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
14-
<i class="fa fa-calendar"></i>&nbsp;
15-
<span></span> <i class="fa fa-caret-down"></i>
6+
<div id="dashboard">
7+
<div>
8+
<h1>Time (in minutes) allocated to each client in the last days</h1>
9+
<div class="clearfix"> </div>
10+
<br />
11+
<div class="time-controls">
12+
<div id="report-range" style="cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
13+
<i class="fa fa-calendar"></i>&nbsp;
14+
<span></span> <i class="fa fa-caret-down"></i>
15+
</div>
16+
</div>
17+
<canvas id="myChart" width="400" height="400"></canvas>
18+
<div id='summary'></div>
19+
</div>
1620
</div>
17-
</div>
18-
<canvas id="myChart" width="400" height="400"></canvas>
19-
<div id='summary'></div>
20-
</div>
21-
</div>
2221
</div>

‎templates/content/goals.php‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
<div id="timetracker-goals">
2-
<h1 class='page-title'>Goals</h1>
3-
<div id="client-input-container" class='center'>
2+
<h1 class='page-title'>Goals</h1>
3+
<div id="client-input-container" class='center'>
44
<form>
5-
<label for="project-select">
6-
Project
7-
<select id="project-select" style="width: 200px;">
8-
</select>
9-
</label>
5+
<label for="project-select">
6+
Project
7+
<select id="project-select" style="width: 200px;">
8+
</select>
9+
</label>
1010
<input tabindex="1" type="text" spellcheck="false" autocomplete="off" class="" value="" placeholder="# hours" id="new-goal-hours">
1111
<label for="new-goal-interval">
12-
<select id="new-goal-interval" style="width: 200px;">
13-
<option value="Weekly">Weekly</option>
14-
<option value="Monthly">Monthly</option>
15-
</select>
16-
</label>
17-
<input type="submit" value="Add goal" id="new-goal-submit" class='ui-button primary'>
12+
<select id="new-goal-interval" style="width: 200px;">
13+
<option value="Weekly">Weekly</option>
14+
<option value="Monthly">Monthly</option>
15+
</select>
16+
</label>
17+
<input type="submit" value="Add goal" id="new-goal-submit" class='ui-button primary'>
1818
</form>
19-
</div>
20-
<div id="dialog-confirm" title="Confirmation Required" class='hidden'>
21-
Are you sure you want to delete this goal?
22-
</div>
23-
<div class="clearfix"> </div>
24-
<div id="goals">
25-
</div>
26-
</div>
19+
</div>
20+
<div id="dialog-confirm" title="Confirmation Required" class='hidden'>
21+
Are you sure you want to delete this goal?
22+
</div>
23+
<div class="clearfix"> </div>
24+
<div id="goals">
25+
</div>
26+
</div>

‎templates/content/index.php‎

Lines changed: 61 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,69 @@
11
<div id="timetracker-content">
2-
<div id="top-work-bar">
3-
<div id="work-input-container">
2+
<div id="top-work-bar">
3+
<div id="work-input-container">
4+
<form>
5+
<input tabindex="1" type="text" spellcheck="false" autocomplete="off" class="" value="" placeholder="What have you done?" id="work-input">
6+
</form>
7+
</div>
8+
<div id="top-work-bar-right">
9+
<div id="timer"></div>
10+
<button id="start-tracking" class="ui-button ui-widget ui-corner-all ui-button-icon-only" title="Start">
11+
<span class="my-icon play-button"></span>
12+
</button>
13+
</div>
14+
15+
</div>
16+
<div class="ui-button ui-widget ui-corner-all" id="manual-entry-button">Manual entry</div>
17+
<div id="dialog-confirm" title="Confirmation Required" class='hidden'>
18+
Are you sure you want to delete this work item?
19+
</div>
20+
<div id="dialog-work-item-edit-form" title="Edit work item" class='hidden'>
21+
<p class="validateTips">All form fields are required.</p>
22+
423
<form>
5-
<input tabindex="1" type="text" spellcheck="false" autocomplete="off" class="" value="" placeholder="What have you done?" id="work-input">
24+
<fieldset>
25+
<label for="name">Name</label>
26+
<input type="text" name="name" id="name" value="" class="text ui-widget-content ui-corner-all">
27+
<div class="clear"></div>
28+
<label for="details">Details</label>
29+
<textarea style='vertical-align: middle;width:300px;' name="details" id="details" cols="40" rows="5" value="" id="details" class="text ui-widget-content ui-corner-all"></textarea>
30+
31+
<!-- Allow form submission with keyboard without duplicating the dialog button -->
32+
<input type="submit" tabindex="-1" style="position:absolute; top:-1000px">
33+
</fieldset>
634
</form>
735
</div>
8-
<div id="top-work-bar-right">
9-
<!-- <input type="text" id="datepicker-from">
10-
<input type="text" id="datepicker-to"> -->
11-
<div id="timer"></div>
12-
<button id="start-tracking" class="ui-button ui-widget ui-corner-all ui-button-icon-only" title="Start">
13-
<span class="my-icon play-button"></span>
14-
</button>
15-
</div>
1636
17-
</div>
18-
<div class="ui-button ui-widget ui-corner-all" id="manual-entry-button">Manual entry</div>
19-
<div id="dialog-confirm" title="Confirmation Required" class='hidden'>
20-
Are you sure you want to delete this work item?
21-
</div>
22-
<div id="dialog-work-item-edit-form" title="Edit work item" class='hidden'>
23-
<p class="validateTips">All form fields are required.</p>
24-
25-
<form>
26-
<fieldset >
27-
<label for="name">Name</label>
28-
<input type="text" name="name" id="name" value="" class="text ui-widget-content ui-corner-all">
29-
<div class="clear"></div>
30-
<label for="details">Details</label>
31-
<textarea style='vertical-align: middle;width:300px;' name="details" id="details" cols="40" rows="5" value="" id="details" class="text ui-widget-content ui-corner-all"></textarea>
32-
33-
<!-- Allow form submission with keyboard without duplicating the dialog button -->
34-
<input type="submit" tabindex="-1" style="position:absolute; top:-1000px">
35-
</fieldset>
36-
</form>
37-
</div>
37+
<div id="dialog-manual-entry" title="Add work item" class='hidden'>
38+
<p class="validateTips">All form fields are required.</p>
3839
39-
<div id="dialog-manual-entry" title="Add work item" class='hidden'>
40-
<p class="validateTips">All form fields are required.</p>
41-
42-
<form id='form-manual-entry'>
43-
<fieldset>
44-
<label for="name">Name</label>
45-
<input type="text" name="name" id="name-manual-entry" value="" class="text ui-widget-content ui-corner-all">
46-
<div class="clear"></div>
47-
<label for="details">Details</label>
48-
<textarea style='vertical-align: middle;width:250px;' name="details" cols="40" rows="5" value="" id="details-manual-entry" class="text ui-widget-content ui-corner-all"></textarea>
49-
<!-- <div id='hours-manual-entry'>&nbsp;</div> -->
50-
<label for="hours">Interval</label>
51-
<input type="text" name="hours" id="hours-manual-entry" value="" class="text ui-widget-content ui-corner-all">
52-
<!-- Allow form submission with keyboard without duplicating the dialog button -->
53-
<input type="submit" tabindex="-1" style="position:absolute; top:-1000px">
54-
</fieldset>
55-
</form>
56-
</div>
40+
<form id='form-manual-entry'>
41+
<fieldset>
42+
<label for="name">Name</label>
43+
<input type="text" name="name" id="name-manual-entry" value="" class="text ui-widget-content ui-corner-all">
44+
<div class="clear"></div>
45+
<label for="details">Details</label>
46+
<textarea style='vertical-align: middle;width:250px;' name="details" cols="40" rows="5" value="" id="details-manual-entry" class="text ui-widget-content ui-corner-all"></textarea>
47+
<!-- <div id='hours-manual-entry'>&nbsp;</div> -->
48+
<label for="hours">Interval</label>
49+
<input type="text" name="hours" id="hours-manual-entry" value="" class="text ui-widget-content ui-corner-all">
50+
<!-- Allow form submission with keyboard without duplicating the dialog button -->
51+
<input type="submit" tabindex="-1" style="position:absolute; top:-1000px">
52+
</fieldset>
53+
</form>
54+
</div>
5755
58-
<div class="clearfix"> </div>
59-
<br/>
60-
<div class="time-controls">
61-
<div id="report-range" style="cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
62-
<i class="fa fa-calendar"></i>&nbsp;
63-
<span></span> <i class="fa fa-caret-down"></i>
64-
</div>
65-
</div>
66-
<br/>
56+
<div class="clearfix"> </div>
57+
<br />
58+
<div class="time-controls">
59+
<div id="report-range" style="cursor: pointer; padding: 5px 10px; border: 1px solid #ccc; width: 100%">
60+
<i class="fa fa-calendar"></i>&nbsp;
61+
<span></span> <i class="fa fa-caret-down"></i>
62+
</div>
63+
</div>
64+
<br />
6765
68-
<div class="clearfix"> </div>
69-
<div id="work-intervals">
70-
</div>
71-
</div>
66+
<div class="clearfix"> </div>
67+
<div id="work-intervals">
68+
</div>
69+
</div>

0 commit comments

Comments
 (0)