Skip to content
This repository was archived by the owner on May 30, 2019. It is now read-only.

Commit 10c12d8

Browse files
laurelnaiadlaurelnaiad
committed
browser: restore spinner layout after skinning
1 parent f9f2853 commit 10c12d8

File tree

7 files changed

+137
-137
lines changed

7 files changed

+137
-137
lines changed

‎appserver/java-spring/static/app/states/_layout.html‎

Lines changed: 67 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,82 @@
1-
<header class="ss-page-header navbar-fixed-top">
1+
<div>
2+
<div ng-if="loading" class="spinner">
3+
</div>
4+
<div ng-if="globalError.length" marked="globalError" class="has-error"></div>
25

3-
<nav class="navbar navbar-default" role="navigation">
4-
<div class="container-fluid">
5-
<div class="navbar-header">
6+
<header class="ss-page-header navbar-fixed-top">
67

7-
<!-- bootstrap responsive navigation -->
8-
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
9-
<span class="sr-only">Toggle navigation</span>
10-
<span class="icon-bar"></span>
11-
<span class="icon-bar"></span>
12-
<span class="icon-bar"></span>
13-
</button>
8+
<nav class="navbar navbar-default" role="navigation">
9+
<div class="container-fluid">
10+
<div class="navbar-header">
1411

15-
<!-- samplestack logo -->
16-
<a class="ss-app-title navbar-brand" href="/">
17-
<img src="app/images/samplestack.svg" border="0">
18-
</a>
12+
<!-- bootstrap responsive navigation -->
13+
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
14+
<span class="sr-only">Toggle navigation</span>
15+
<span class="icon-bar"></span>
16+
<span class="icon-bar"></span>
17+
<span class="icon-bar"></span>
18+
</button>
1919

20-
</div>
21-
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
22-
<ul class="nav navbar-nav navbar-right">
20+
<!-- samplestack logo -->
21+
<a class="ss-app-title navbar-brand" href="/">
22+
<img src="app/images/samplestack.svg" border="0">
23+
</a>
24+
25+
</div>
26+
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
27+
<ul class="nav navbar-nav navbar-right">
2328

24-
<!-- login/account dropdown -->
25-
<li class="ss-login" ng-if="!store.session">
26-
<button
27-
class="btn btn-primary btn-sm"
28-
id="nav-log-in"
29-
href=""
30-
ng-click="openLogin()"
31-
>Log In
32-
</button>
33-
</li>
29+
<!-- login/account dropdown -->
30+
<li class="ss-login" ng-if="!store.session">
31+
<button
32+
class="ss-login-dialog-open btn btn-primary btn-sm"
33+
id="nav-log-in"
34+
href=""
35+
ng-click="openLogin()"
36+
>Log In
37+
</button>
38+
</li>
3439

35-
<li
36-
ss-account-dropdown
37-
ng-if="store.session"
38-
class="ss-account-dropdown dropdown"
39-
></li>
40+
<li
41+
ss-account-dropdown
42+
ng-if="store.session"
43+
class="ss-account-dropdown dropdown"
44+
></li>
4045

41-
<!-- ask button -->
42-
<li
43-
class="ss-ask-button"
44-
ng-class="store.session ? 'active' : 'inactive'"
45-
>
46-
<a
47-
href=""
48-
class="navbar-ask-question"
49-
ng-click="store.session ? ask() : ''"
46+
<!-- ask button -->
47+
<li
48+
class="ss-ask-button"
5049
ng-class="store.session ? 'active' : 'inactive'"
5150
>
52-
<span class="glyphicon glyphicon-question-sign"></span>
53-
Ask A Question
54-
</a>
55-
</li>
51+
<a
52+
href=""
53+
class="navbar-ask-question"
54+
ng-click="store.session ? ask() : ''"
55+
ng-class="store.session ? 'active' : 'inactive'"
56+
>
57+
<span class="glyphicon glyphicon-question-sign"></span>
58+
Ask A Question
59+
</a>
60+
</li>
5661

57-
</ul>
62+
</ul>
63+
</div>
5864
</div>
59-
</div>
60-
</nav>
61-
62-
<!-- TODO loading/error message locations -->
63-
<div ng-if="loading" class="spinner"></div>
64-
<div ng-if="globalError.length" marked="globalError" class="has-error"></div>
65-
66-
</header>
65+
</nav>
6766

67+
</header>
6868

69-
<div ng-class="{ loading: loading }"></div>
70-
<div ng-if="localError" class="has-error">{{localError}}</div>
69+
<div ng-class="{ loading: loading }">
70+
<div ng-if="localError" class="has-error">{{localError}}</div>
71+
<section class="ss-main">
72+
<div ui-view></div>
73+
</section>
7174

72-
<main class="ss-main">
73-
<div ui-view></div>
74-
</main>
75+
<footer class="ss-page-footer">
76+
<p class="text-center">
77+
<a href="insert-url.php">Samplestack 1.0.0-ea3.1</a>&nbsp;&nbsp;|&nbsp;&nbsp;Copyright &copy; 2014 <a href="insert-url.php">MarkLogic Corporation</a>, licensed under the Apache License, <a href="insert-url.php" >Version 2.0.</a>&nbsp;&nbsp;|&nbsp;&nbsp;Seed content compliments of Stack Overflow under <a href="insert-url.php">cc-by-sa</a>.
78+
</p>
79+
</footer>
80+
</div>
7581

76-
<footer class="ss-page-footer">
77-
<p class="text-center">
78-
<a href="insert-url.php">Samplestack 1.0.0-ea3.1</a>&nbsp;&nbsp;|&nbsp;&nbsp;Copyright &copy; 2014 <a href="insert-url.php">MarkLogic Corporation</a>, licensed under the Apache License, <a href="insert-url.php" >Version 2.0.</a>&nbsp;&nbsp;|&nbsp;&nbsp;Seed content compliments of Stack Overflow under <a href="insert-url.php">cc-by-sa</a>.
79-
</p>
80-
</footer>
82+
</div>

‎appserver/java-spring/static/app/styles/style.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎appserver/java-spring/static/app/styles/style.css.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎appserver/java-spring/static/index.html‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@
3838

3939
<body>
4040

41-
<!-- TODO: add a spinner -->
42-
4341
<!--
4442
This is the real body of the app. It is initially hidden until it is
4543
bootstrapped. ng-cloak allows it to be invisible until template code

‎browser/src/app/states/_layout.html‎

Lines changed: 67 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,82 @@
1-
<header class="ss-page-header navbar-fixed-top">
1+
<div>
2+
<div ng-if="loading" class="spinner">
3+
</div>
4+
<div ng-if="globalError.length" marked="globalError" class="has-error"></div>
25

3-
<nav class="navbar navbar-default" role="navigation">
4-
<div class="container-fluid">
5-
<div class="navbar-header">
6+
<header class="ss-page-header navbar-fixed-top">
67

7-
<!-- bootstrap responsive navigation -->
8-
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
9-
<span class="sr-only">Toggle navigation</span>
10-
<span class="icon-bar"></span>
11-
<span class="icon-bar"></span>
12-
<span class="icon-bar"></span>
13-
</button>
8+
<nav class="navbar navbar-default" role="navigation">
9+
<div class="container-fluid">
10+
<div class="navbar-header">
1411

15-
<!-- samplestack logo -->
16-
<a class="ss-app-title navbar-brand" href="/">
17-
<img src="app/images/samplestack.svg" border="0">
18-
</a>
12+
<!-- bootstrap responsive navigation -->
13+
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
14+
<span class="sr-only">Toggle navigation</span>
15+
<span class="icon-bar"></span>
16+
<span class="icon-bar"></span>
17+
<span class="icon-bar"></span>
18+
</button>
1919

20-
</div>
21-
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
22-
<ul class="nav navbar-nav navbar-right">
20+
<!-- samplestack logo -->
21+
<a class="ss-app-title navbar-brand" href="/">
22+
<img src="app/images/samplestack.svg" border="0">
23+
</a>
24+
25+
</div>
26+
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
27+
<ul class="nav navbar-nav navbar-right">
2328

24-
<!-- login/account dropdown -->
25-
<li class="ss-login" ng-if="!store.session">
26-
<button
27-
class="btn btn-primary btn-sm"
28-
id="nav-log-in"
29-
href=""
30-
ng-click="openLogin()"
31-
>Log In
32-
</button>
33-
</li>
29+
<!-- login/account dropdown -->
30+
<li class="ss-login" ng-if="!store.session">
31+
<button
32+
class="ss-login-dialog-open btn btn-primary btn-sm"
33+
id="nav-log-in"
34+
href=""
35+
ng-click="openLogin()"
36+
>Log In
37+
</button>
38+
</li>
3439

35-
<li
36-
ss-account-dropdown
37-
ng-if="store.session"
38-
class="ss-account-dropdown dropdown"
39-
></li>
40+
<li
41+
ss-account-dropdown
42+
ng-if="store.session"
43+
class="ss-account-dropdown dropdown"
44+
></li>
4045

41-
<!-- ask button -->
42-
<li
43-
class="ss-ask-button"
44-
ng-class="store.session ? 'active' : 'inactive'"
45-
>
46-
<a
47-
href=""
48-
class="navbar-ask-question"
49-
ng-click="store.session ? ask() : ''"
46+
<!-- ask button -->
47+
<li
48+
class="ss-ask-button"
5049
ng-class="store.session ? 'active' : 'inactive'"
5150
>
52-
<span class="glyphicon glyphicon-question-sign"></span>
53-
Ask A Question
54-
</a>
55-
</li>
51+
<a
52+
href=""
53+
class="navbar-ask-question"
54+
ng-click="store.session ? ask() : ''"
55+
ng-class="store.session ? 'active' : 'inactive'"
56+
>
57+
<span class="glyphicon glyphicon-question-sign"></span>
58+
Ask A Question
59+
</a>
60+
</li>
5661

57-
</ul>
62+
</ul>
63+
</div>
5864
</div>
59-
</div>
60-
</nav>
61-
62-
<!-- TODO loading/error message locations -->
63-
<div ng-if="loading" class="spinner"></div>
64-
<div ng-if="globalError.length" marked="globalError" class="has-error"></div>
65-
66-
</header>
65+
</nav>
6766

67+
</header>
6868

69-
<div ng-class="{ loading: loading }"></div>
70-
<div ng-if="localError" class="has-error">{{localError}}</div>
69+
<div ng-class="{ loading: loading }">
70+
<div ng-if="localError" class="has-error">{{localError}}</div>
71+
<section class="ss-main">
72+
<div ui-view></div>
73+
</section>
7174

72-
<main class="ss-main">
73-
<div ui-view></div>
74-
</main>
75+
<footer class="ss-page-footer">
76+
<p class="text-center">
77+
<a href="insert-url.php">Samplestack 1.0.0-ea3.1</a>&nbsp;&nbsp;|&nbsp;&nbsp;Copyright &copy; 2014 <a href="insert-url.php">MarkLogic Corporation</a>, licensed under the Apache License, <a href="insert-url.php" >Version 2.0.</a>&nbsp;&nbsp;|&nbsp;&nbsp;Seed content compliments of Stack Overflow under <a href="insert-url.php">cc-by-sa</a>.
78+
</p>
79+
</footer>
80+
</div>
7581

76-
<footer class="ss-page-footer">
77-
<p class="text-center">
78-
<a href="insert-url.php">Samplestack 1.0.0-ea3.1</a>&nbsp;&nbsp;|&nbsp;&nbsp;Copyright &copy; 2014 <a href="insert-url.php">MarkLogic Corporation</a>, licensed under the Apache License, <a href="insert-url.php" >Version 2.0.</a>&nbsp;&nbsp;|&nbsp;&nbsp;Seed content compliments of Stack Overflow under <a href="insert-url.php">cc-by-sa</a>.
79-
</p>
80-
</footer>
82+
</div>

‎browser/src/app/styles/style.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
background-repeat: no-repeat;
1010
height: 50vh;
1111
position: absolute;
12-
width: 100vh;
12+
width: 100%;
1313
z-index: 1;
1414
}
1515

‎browser/src/index.html‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@
3838

3939
<body>
4040

41-
<!-- TODO: add a spinner -->
42-
4341
<!--
4442
This is the real body of the app. It is initially hidden until it is
4543
bootstrapped. ng-cloak allows it to be invisible until template code

0 commit comments

Comments
 (0)