Skip to content

Commit 4db0d0a

Browse files
ali-hamudali-hamud
authored
Merge Dev into master. (microsoft#115)
* fix postinstall bug * update package version * live sample new design
1 parent 256ceba commit 4db0d0a

38 files changed

+1412
-354
lines changed

‎demo/code-demo/code_area.html‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<!DOCTYPE html>
2+
<div class="editorTitle">Code</div>
3+
<div class="textAreaControls">
4+
<button id="btnRunCode" class="textAreaControl">
5+
<img src="images\run.png"/> Run
6+
</button>
7+
<button id="btnCopyCode" class="textAreaControl" onclick="CopyCode();">
8+
<img src="images\copy.png"/> Copy
9+
</button>
10+
</div>
11+
<textarea id="txtCode" readonly />

‎demo/code-demo/images/arrow.png‎

602 Bytes
Loading

‎demo/code-demo/images/arrow_flipped.png‎

665 Bytes
Loading

‎demo/code-demo/images/clear.png‎

1.27 KB
Loading

‎demo/code-demo/images/copy.png‎

1.5 KB
Loading

‎demo/code-demo/images/run.png‎

1.81 KB
Loading

‎demo/code-demo/index.html‎

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,37 +7,60 @@
77

88
<link rel="stylesheet" href="/node_modules/bootstrap/dist/css/bootstrap.css" />
99
<link rel="stylesheet" type="text/css" href="style/style.css">
10+
<link rel="stylesheet" type="text/css" href="style/layout.css">
1011
</head>
1112

1213
<body>
13-
<header class="ms-font-xxl">
14-
<div class="logo-text">
15-
<span class="logo-text-span">Microsoft Power BI JavaScript SDK - Live Sample</span>
16-
</div>
17-
<div id="oldSample">
18-
<a href="/static.html">Old Sample</a>
14+
<header>
15+
<div id="navbar">
16+
<div class="logo-text">
17+
<div class="logo-text-span">Microsoft Power BI – Report Embed Sample</div>
18+
</div>
19+
<div id="steps-nav-bar">
20+
<div id="steps-ul-dev">
21+
<ul id="steps-ul" class="steps-ul">
22+
<li id="steps-auth" class="steps-li-active" onclick="OpenAuthStep();">
23+
<div><a href="#">Authorize</a></div>
24+
<div class="step-div">
25+
</div>
26+
</li>
27+
<li id="steps-embed" onclick="OpenEmbedStep();">
28+
<div><a href="#">Embed</a></div>
29+
<div class="step-div"></div>
30+
</li>
31+
<li id="steps-interact" onclick="OpenInteractStep();">
32+
<div><a href="#">Interact</a></div>
33+
<div class="step-div"></div>
34+
</li>
35+
</ul>
36+
</div>
37+
</div>
1938
</div>
2039
</header>
2140

22-
<div id="mainContent" class="jumbotron">
41+
<div id="mainContent">
42+
</div>
43+
44+
<div id="oldSample">
45+
<a href="/static.html">Old Sample</a>
2346
</div>
2447

2548
<script src="/node_modules/jquery/dist/jquery.js"></script>
2649
<script src="/node_modules/es6-promise/dist/es6-promise.js"></script>
27-
<script src="/node_modules/fetch/lib/fetch.js"></script>
2850
<script src="/node_modules/powerbi-client/dist/powerbi.js"></script>
2951

3052
<script src="scripts/codesamples.js"></script>
3153

3254
<script src="scripts/index.js"></script>
3355
<script src="scripts/utils.js"></script>
56+
<script src="scripts/logger.js"></script>
3457
<script src="scripts/session_utils.js"></script>
3558

36-
3759
<script src="scripts/report.js"></script>
3860

3961
<script src="scripts/step_authorize.js"></script>
4062
<script src="scripts/step_embed.js"></script>
4163
<script src="scripts/step_interact.js"></script>
64+
4265
</body>
4366
</html>

‎demo/code-demo/log_window.html‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<div id="response" class="responseDiv">
2+
<div class="editorTitle">Log Viewer</div>
3+
<div class="textAreaControls">
4+
<button id="btnCopyResponse" class="textAreaControl" onclick="CopyResponseWindow();">
5+
<img src="images\copy.png"/> Copy
6+
</button>
7+
<button id="btnClearResponse" class="textAreaControl" onclick="ClearTextArea('#txtResponse');">
8+
<img src="images\clear.png"/> Clear
9+
</button>
10+
</div>
11+
<textarea id="txtResponse" class="responseTextArea" />
12+
</div>

‎demo/code-demo/report.html‎

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,39 @@
11
<!DOCTYPE html>
2-
<div>
3-
<div id="steps-nav-bar">
4-
<div class="main-title">Report Embed</div>
5-
<div id="steps-ul-dev">
6-
<ul id="steps-ul" class="steps-ul">
7-
<li id="steps-auth" class="steps-li-active" onclick="OpenAuthStep();"><a href="#">Authorize</a></li>
8-
<li id="steps-embed" onclick="OpenEmbedStep();"><a href="#">Embed</a></li>
9-
<li id="steps-interact" onclick="OpenInteractStep();"><a href="#">Interact</a></li>
10-
</ul>
11-
</div>
2+
<div id="authorize-step-wrapper">
3+
</div>
4+
<div id="embed-and-interact-steps-wrapper">
5+
<div class="topPanel">
6+
<div id="settings"></div>
7+
<div id="embedCodeDiv"></div>
8+
<div id="logWindow"></div>
129
</div>
13-
14-
<div id="embed-and-interact-panel">
15-
<div id="right-pane" class="halfWidth left">
16-
</div>
1710

18-
<div id="left-pane" class="halfWidth right">
19-
<div id="embedArea">
20-
<h3>Embedded Report Area</h3>
21-
<h5>The following div id is <b>reportContainer</b>. In code, we embed a report to it.</h5>
22-
<div id="reportContainer" style="width: 800px; height: 600px; background: #DDDDDD;"></div>
23-
</div>
11+
<div class="bottomPanel">
12+
<div id="embedArea">
13+
<div class="editorTitle">
14+
<div class="editorTitleText">Embedded report</div>
15+
</div>
16+
<div id="reportContainer"></div>
2417
</div>
2518
</div>
2619
</div>
2720

2821
<script>
29-
var embedUrl = GetParameterByName("embedUrl");
30-
if (!embedUrl)
22+
$(document).ready(function() {
23+
$("#authorize-step-wrapper").load("step_authorize.html");
24+
25+
LoadLogWindow("#logWindow");
26+
27+
if (GetParameterByName("embedUrl") || GetParameterByName("embedId") || GetParameterByName("accessToken"))
3128
{
32-
// Open Authorization Step after this page loads.
33-
OpenAuthStep();
29+
OpenEmbedStep();
3430
}
3531
else
3632
{
37-
OpenEmbedStep();
33+
// Open Authorization Step after this page loads.
34+
OpenAuthStep();
3835
}
39-
36+
37+
Log = InitLogger("txtResponse");
38+
});
4039
</script>

0 commit comments

Comments
 (0)