8000 Merged in /branches/dev r3251:3620 (excluding autocomplete, modal, to… · ainformatico/jquery-ui@90fb45d · GitHub
Skip to content

Commit 90fb45d

Browse files
scottgonzalezscottgonzalez
committed
Merged in /branches/dev r3251:3620 (excluding autocomplete, modal, tooltip, menu; including menu static tests).
1 parent 975b02a commit 90fb45d

72 files changed

Lines changed: 3220 additions & 1750 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎demos/button/checkbox.html‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<title>jQuery UI Button - Checkboxes demo</title>
5+
<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
6+
<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
7+
<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
8+
<script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script>
9+
<script type="text/javascript" src="../../ui/jquery.ui.button.js"></script>
10+
<link type="text/css" href="../demos.css" rel="stylesheet" />
11+
<script type="text/javascript">
12+
$(function() {
13+
$("#check").button();
14+
$("#format").buttonset();
15+
});
16+
</script>
17+
<style 8DE3 >
18+
#format { margin-top: 2em; }
19+
</style>
20+
</head>
21+
<body>
22+
23+
<div class="demo">
24+
25+
<input type="checkbox" id="check" /><label for="check">Toggle</label>
26+
27+
<div id="format">
28+
<input type="checkbox" id="check1" /><label for="check1">B</label>
29+
<input type="checkbox" id="check2" /><label for="check2">I</label>
30+
<input type="checkbox" id="check3" /><label for="check3">U</label>
31+
</div>
32+
33+
</div><!-- End demo -->
34+
35+
36+
37+
<div class="demo-description">
38+
39+
<p>TODO</p>
40+
41+
</div><!-- End demo-description -->
42+
43+
44+
45+
</body>
46+
</html>

‎demos/button/default.html‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<title>jQuery UI Button - Default demo</title>
5+
<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
6+
<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
7+
<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
8+
<script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script>
9+
<script type="text/javascript" src="../../ui/jquery.ui.button.js"></script>
10+
<link type="text/css" href="../demos.css" rel="stylesheet" />
11+
<script type="text/javascript">
12+
$(function() {
13+
$("button, input:submit, a").button();
14+
});
15+
</script>
16+
<style>
17+
18+
</style>
19+
</head>
20+
<body>
21+
22+
<div class="demo">
23+
24+
<button>A button element</button>
25+
26+
<input type="submit" value="A submit button">
27+
28+
<a href="#">An anchor</a>
29+
30+
</div><!-- End demo -->
31+
32+
33+
34+
<div class="demo-description">
35+
36+
<p>Examples of the markup that can be used for buttons: A button element, an input of type submit and an anchor.</p>
37+
38+
</div><!-- End demo-description -->
39+
40+
41+
42+
</body>
43+
</html>

‎demos/button/icons.html‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<title>jQuery UI Button - Icons demo</title>
5+
<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
6+
<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
7+
<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
8+
<script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script>
9+
<script type="text/javascript" src="../../ui/jquery.ui.button.js"></script>
10+
<link type="text/css" href="../demos.css" rel="stylesheet" />
11+
<script type="text/javascript">
12+
$(function() {
13+
$("button:first").button({
14+
icons: {
15+
primary: 'ui-icon-locked'
16+
},
17+
text: false
18+
}).next().button({
19+
icons: {
20+
primary: 'ui-icon-locked'
21+
}
22+
}).next().button({
23+
icons: {
24+
primary: 'ui-icon-gear',
25+
secondary: 'ui-icon-triangle-1-s'
26+
}
27+
}).next().button({
28+
icons: {
29+
primary: 'ui-icon-gear',
30+
secondary: 'ui-icon-triangle-1-s'
31+
},
32+
text: false
33+
});
34+
});
35+
</script>
36+
<style>
37+
38+
</style>
39+
</head>
40+
<body>
41+
42+
<div class="demo">
43+
44+
<button>Button with icon only</button>
45+
<button>Button with icon on the left</button>
46+
<button>Button with two icons</button>
47+
<button>Button with two icons and no text</button>
48+
49+
</div><!-- End demo -->
50+
51+
52+
53+
<div class="demo-description">
54+
55+
<p>Some buttons with various combinations of text and icons, here specified via metadata.</p>
56+
57+
</div><!-- End demo-description -->
58+
59+
60+
61+
</body>
62+
</html>

‎demos/button/index.html‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<title>jQuery UI Button Demos</title>
5+
<link type="text/css" href="../demos.css" rel="stylesheet" />
6+
</head>
7+
<body>
8+
9+
<div class="demos-nav">
10+
<h4>Examples</h4>
11+
<ul>
12+
<li class="demo-config-on"><a href="default.html">Default functionality</a></li>
13+
<li><a href="radio.html">Radios</a></li>
14+
<li><a href="checkbox.html">Checkboxes</a></li>
15+
<li><a href="icons.html">Icons</a></li>
16+
<li><a href="toolbar.html">Toolbar</a></li>
17+
<li><a href="splitbutton.html">Split Button</a></li>
18+
</ul>
19+
</div>
20+
21+
</body>
22+
</html>

‎demos/button/radio.html‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<title>jQuery UI Button - Radio Buttons demo</title>
5+
<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
6+
<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
7+
<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
8+
<script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script>
9+
<script type="text/javascript" src="../../ui/jquery.ui.button.js"></script>
10+
<link type="text/css" href="../demos.css" rel="stylesheet" />
11+
<script type="text/javascript">
12+
$(function() {
13+
$("#radio1").buttonset();
14+
});
15+
</script>
16+
<style>
17+
18+
</style>
19+
</head>
20+
<body>
21+
22+
<div class="demo">
23+
24+
<form>
25+
<div id="radio1">
26+
<input type="radio" id="radio1" name="radio" /><label for="radio1">Choice 1</label>
27+
<input type="radio" id="radio2" name="radio" checked="checked" /><label for="radio2">Choice 2</label>
28+
<input type="radio" id="radio3" name="radio" /><label for="radio3">Choice 3</label>
29+
</div>
30+
</form>
31+
32+
</div><!-- End demo -->
33+
34+
35+
36+
<div class="demo-description">
37+
38+
<p>A set of three radio buttons transformed into a button set.</p>
39+
40+
</div><!-- End demo-description -->
41+
42+
43+
44+
</body>
45+
</html>

‎demos/button/splitbutton.html‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
<!doctype html>
2+
<html lang="en">
3+
<head>
4+
<title>jQuery UI Button - Default demo</title>
5+
<link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" />
6+
<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
7+
<script type="text/javascript" src="../../ui/jquery.ui.core.js"></script>
8+
<script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script>
9+
<script type="text/javascript" src="../../ui/jquery.ui.button.js"></script>
10+
<link type="text/css" href="../demos.css" rel="stylesheet" />
11+
<script type="text/javascript">
12+
$(function() {
13+
$("#rerun").button().click(function() {
14+
alert("Running the last action");
15+
})
16+
.next()
17+
.button({
18+
text: false,
19+
icons: {
20+
primary: "ui-icon-triangle-1-s"
21+
}
22+
})
23+
.click(function() {
24+
alert("Could display a menu to select an action");
25+
})
26+
.parent()
27+
.buttonset();
28+
});
29+
</script>
30+
<style>
31+
32+
</style>
33+
</head>
34+
<body>
35+
36+
<div class="demo">
37+
38+
<div>
39+
<button id="rerun">Run last action</button>
40+
<button id="select">Select an action</button>
41+
</div>
42+
43+
</div><!-- End demo -->
44+
45+
46+
47+
<div class="demo-description">
48+
49+
<p>An example of a split button built with two buttons: A plan button with just text, one with only a primary icon
50+
and no text. Both are grouped together in a set.</p>
51+
52+
</div><!-- End demo-description -->
53+
54+
55+
56+
</body>
57+
</html>

0 commit comments

Comments
 (0)