Skip to content

Commit fe04614

Browse files
damyanpetevdamyanpetev
committed
Merge remote-tracking branch 'remotes/IgniteUI/help-samples-src/16.2' into date-editor-format
# Conflicts: # HTMLSamples/editors/strings-en.json # HTMLSamples/editors/strings-ja.json
2 parents bc6c951 + e5de1b7 commit fe04614

9 files changed

Lines changed: 140 additions & 177 deletions

File tree

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ node_js:
33
- '4'
44
script:
55
# clone gh-pages
6-
- git clone -b master https://${GH_TOKEN}@github.com/IgniteUI/help-samples.git dist
6+
- git clone -b master https://${GH_TOKEN}@${TARGET_REPO} dist
77

88
# wipe content in target folder
99
- rm -rf dist/${TRAVIS_BRANCH}

‎HTMLSamples/data-chart/chart-title.html‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@
2626
height: "400px",
2727
dataSource: lastFiveYears,
2828
title: "$$(Chart_title_energy_production)",
29+
titleTextColor: "#2e9ca6",
30+
titleTextStyle: "20pt Arial",
2931
subtitle: "$$(Chart_subtitle_energy_production)",
32+
subtitleTextColor: "#2e9ca6",
33+
subtitleTextStyle: "14pt Arial",
3034
horizontalZoomable: true,
3135
verticalZoomable: true,
3236
legend: { element: "columnLegend" },
@@ -105,9 +109,7 @@
105109

106110
<style type="text/css">
107111
td { vertical-align: top; }
108-
.chartElement {
109-
padding-bottom: 20px;
110-
}
112+
.chartElement { padding-bottom: 20px; }
111113
</style>
112114

113115
<table><tr><td id="columnChart" class="chartElement"></td><td id="columnLegend" style="float: left"></td></tr></table>

‎HTMLSamples/editors/date-picker-new.html‎

Lines changed: 0 additions & 162 deletions
This file was deleted.

‎HTMLSamples/editors/date-picker.html‎

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<title>$$(Title_date-picker-new)</title>
5+
<!-- Ignite UI Required Combined CSS Files -->
6+
<link href="%%ignite-ui%%/css/themes/infragistics/infragistics.theme.css" rel="stylesheet">
7+
<link href="%%ignite-ui%%/css/structure/infragistics.css" rel="stylesheet">
8+
<style>
9+
#container {
10+
border: 1px solid #ccc;
11+
box-sizing: border-box;
12+
padding: 20px;
13+
}
14+
15+
#igDatePickersContainer {
16+
float: left;
17+
}
18+
19+
.group-fields {
20+
margin-bottom: 10px;
21+
}
22+
23+
.group-fields label {
24+
display: block;
25+
line-height: 18px;
26+
}
27+
28+
#ValuesContainer {
29+
float: right;
30+
}
31+
32+
.clearfix:after {
33+
content: "";
34+
display: table;
35+
clear: both;
36+
}
37+
38+
@media screen and (max-width:570px) {
39+
#igDatePickersContainer,#ValuesContainer {
40+
float: none;
41+
}
42+
#ValuesContainer {
43+
margin-top:20px;
44+
}
45+
}
46+
</style>
47+
48+
<script src="%%modernizr%%"></script>
49+
<script src="%%jquery%%"></script>
50+
<script src="%%jquery-ui%%"></script>
51+
52+
<!-- Ignite UI Required Combined JavaScript Files -->
53+
<script src="%%ignite-ui%%/js/infragistics.core.js"></script>
54+
<script src="%%ignite-ui%%/js/infragistics.lob.js"></script>
55+
</head>
56+
<body>
57+
<div id="container" class="clearfix">
58+
<div id="igDatePickersContainer">
59+
<form id="form" name="FormSubmit" action="javascript:console.log('$$(Submit)');">
60+
<div class="group-fields">
61+
<label for="datePicker1">$$(Date_Object)</label>
62+
<input id="datePicker1" type="date" name="datePicker_date"></input>
63+
</div>
64+
<div class="group-fields">
65+
<label for="datePicker2">$$(Edit_Mode_Text)</label>
66+
<input id="datePicker2" type="date" name="datePicker_editModeText"></input>
67+
</div>
68+
<div class="group-fields">
69+
<label for="datePicker3">$$(Display_Mode_Text)</label>
70+
<input id="datePicker3" type="date" name="displayModeText"></input>
71+
</div>
72+
<input type="submit" id="submitBtn" value="$$(Submit)"></input>
73+
</form>
74+
</div>
75+
76+
<div id="ValuesContainer">
77+
<h4>$$(DatePickers_submited_values):</h4>
78+
<div id="results">
79+
</div>
80+
</div>
81+
</div>
82+
83+
<script type='text/javascript'>
84+
85+
$(function () {
86+
$("#datePicker1").igDatePicker({
87+
value: new Date(2017, 11, 8),
88+
dataMode: "date",
89+
dateDisplayFormat: "yyyy/MM/dd dddd"
90+
});
91+
92+
$("#datePicker2").igDatePicker({
93+
value: new Date(2017, 11, 8),
94+
dataMode: "editModeText",
95+
dateDisplayFormat: "yyyy/MM/dd dddd"
96+
});
97+
98+
$("#datePicker3").igDatePicker({
99+
value: new Date(2017, 11, 8),
100+
dataMode: "displayModeText",
101+
dateDisplayFormat: "yyyy/MM/dd dddd"
102+
});
103+
104+
var headers = $('.group-fields label');
105+
$("#form").submit(function (event) {
106+
var submittedValues = $(this).serializeArray(),
107+
$results = $("#results");
108+
$results.empty();
109+
for (var i = 0 ; i < submittedValues.length; i++) {
110+
$results.append("<p class='p'><span class='header'>" + headers[i].textContent + ": " + "</span> <strong>" + submittedValues[i].value + "</strong></p>");
111+
}
112+
return false;
113+
});
114+
});
115+
116+
</script>
117+
118+
</body>
119+
</html>

‎HTMLSamples/editors/strings-en.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
"constraints": "Using different display format and Date constraints. Note the display format is used for the warning shown when entering value outside the min/max range.",
44
"Control_Name": "Control Name",
55
"date_config": "Date and Time Configuration",
6+
"Date_Object":"Date object",
7+
"Display_Mode_Text":"Display mode text",
8+
"Edit_Mode_Text":"Edit mode text",
69
"DatePickers_submited_values": "DatePickers submitted values",
710
"default_config": "Default Configuration",
8-
"End_Date": "End Date",
911
"enter_today": "Enter Today's Date",
1012
"enUS": "English, United States",
1113
"HTML_Element": "HTML Element",
@@ -23,7 +25,6 @@
2325
"KO_Plain_Editors": "Plain INPUTs",
2426
"KO_Ship_Date": "Ship Date",
2527
"set_after_max": "Set after maximum",
26-
"Start_Date": "Start Date",
2728
"Submit": "Submit",
2829
"time_config": "Time Configuration",
2930
"Title_angular": "AngularJS",

‎HTMLSamples/editors/strings-ja.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
"date_config": "日付と時間構成",
66
"DatePickers_submited_values": "DatePicker の送信された値",
77
"default_config": "デフォルトの構成",
8-
"End_Date": "終了日",
8+
"Date_Object":"日付オブジェクト",
9+
"Display_Mode_Text":"表示モードのテキスト",
10+
"Edit_Mode_Text":"編集モードのテキスト",
911
"enter_today": "今日の日付の入力",
1012
"enUS": "英語 (米国)",
1113
"HTML_Element": "HTML 要素",
@@ -23,7 +25,6 @@
2325
"KO_Plain_Editors": "プレーン INPUT 要素",
2426
"KO_Ship_Date": "出荷日付",
2527
"set_after_max": "最大日付以降に設定",
26-
"Start_Date": "開始日",
2728
"Submit": "送信",
2829
"time_config": "時間構成",
2930
"Title_angular": "AngularJS との連携",

‎build/config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"liveUrl": "https://igniteui.github.io/help-samples",
33
"strings": {
44
"resultEN": "Result",
5-
"resultJA": "Result"
5+
"resultJA": "サンプル"
66
},
77
"tabSize": 4,
88
"templateScriptTypes": [

‎build/createFiddleFiles.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,18 @@ module.exports = function(options) {
6868
basePath = path.dirname(file.path),
6969
relativePath = basePath.split("HTMLSamples").pop().replace(/\\/g, "/"),
7070
htmlFile, jsFile, cssFile,
71-
html = [], js = "", css = "",
71+
html = [], js = "", css = "",
72+
resultStr = file.lang === "ja" ? options.strings.resultJA : options.strings.resultEN,
7273
embed = {
7374
"embed": [{
74-
"label": "HTML",
75-
"path": path.posix.join(options.version, relativePath, "fiddle/demo.html")
76-
}, {
7775
"label": "JS",
7876
"path": path.posix.join(options.version, relativePath, "fiddle/demo.js")
7977
},{
78+
"label": "HTML",
79+
"path": path.posix.join(options.version, relativePath, "fiddle/demo.html")
80+
}, {
8081
"type": "htmlpage",
81-
"label": "Result",
82+
"label": resultStr,
8283
"url": options.liveUrl + path.posix.join("/" + options.version, relativePath, "/index.html")
8384
}]
8485
};

‎build/updateResources.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ module.exports = function (options) {
4343
$ = file.cheerio = file.cheerio || cheerio.load(contents, { decodeEntities: false });
4444

4545
if (file.lang == "ja") {
46-
$("head").append("<script src=\"%%ignite-ui%%/js/i18n/infragistics-ja.js\"></script>")
46+
$("head").append("<script src=\"%%ignite-ui%%/js/i18n/infragistics-ja.js\"></script>");
47+
$("head").append("<script src=\"%%ignite-ui%%/js/modules/i18n/regional/infragistics.ui.regional-ja.js\"></script>");
4748
}
4849

4950
// script tags

0 commit comments

Comments
 (0)