Skip to content

Commit 3ddda00

Browse files
committed
Update unstaged changes
1 parent 6527101 commit 3ddda00

File tree

12 files changed

+779
-436
lines changed

12 files changed

+779
-436
lines changed
0 Bytes
Binary file not shown.

WEB-INF/classes/themes/reading.view

Lines changed: 49 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,14 @@
77
<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
88
<meta name="description" content="" />
99
<meta name="author" content="" />
10+
<link href="/favicon.png" rel="icon" type="image/x-icon"/>
11+
<link href="/favicon.png" rel="shortcut icon" type="image/x-icon"/>
1012

1113
<title>{%book.name%}</title>
1214

1315
<!-- Bootstrap core CSS -->
14-
<link href="http://getbootstrap.com/dist/css/bootstrap.min.css" rel="stylesheet" />
16+
<link href="/scripts/bootstrap/bootstrap.min.css?raw=true" rel="stylesheet" />
1517
<!-- Custom styles for this template -->
16-
17-
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
18-
<!--[if lt IE 9]><script src="http://getbootstrap.com/assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
19-
<script src="http://getbootstrap.com/assets/js/ie-emulation-modes-warning.js"></script>
20-
21-
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
22-
<!--[if lt IE 9]>
23-
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
24-
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
25-
<![endif]-->
26-
2718
<style type="text/css">
2819
#list {
2920
overflow-x:hidden;
@@ -61,101 +52,70 @@
6152
.arrowline { top:-1px; border-style:dashed dashed solid; border-width:7px; border-color:transparent transparent #d9d9d9 transparent; }
6253
.arrowbg { top:0; border-style:dashed dashed solid; border-width:7px; border-color:transparent transparent #fff transparent; }
6354
</style>
64-
<script type="text/javascript" src="//jquery.com/jquery-wp-content/themes/jquery/js/jquery-1.11.2.min.js"></script>
65-
<script type="text/javascript" src="//ingod.asia/themes/scripts/timer.js"></script>
66-
55+
<!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
56+
<!--[if lt IE 9]><script src="http://getbootstrap.com/assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
57+
<script src="/scripts/bootstrap/ie-emulation-modes-warning.js?raw=true"></script>
58+
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
59+
<!--[if lt IE 9]>
60+
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
61+
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
62+
<![endif]-->
63+
<script type="text/javascript" src="/scripts/jquery-1.11.3.min.js?raw=true"></script>
64+
<script type="text/javascript" src="/scripts/timer.js?raw=true"></script>
6765
</head>
6866
<body>
69-
<!-- Fixed navbar -->
70-
<nav class="navbar navbar-default navbar-fixed-top">
71-
<div class="container">
72-
<div class="navbar-header">
73-
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
74-
<span class="sr-only">Toggle navigation</span>
75-
<span class="icon-bar"></span>
76-
<span class="icon-bar"></span>
77-
<span class="icon-bar"></span>
78-
</button>
79-
<a class="navbar-brand" href="#">Library</a>
80-
</div>
81-
<div id="navbar" class="collapse navbar-collapse">
82-
<ul class="nav navbar-nav">
83-
<li class="active"><a href="#">Home</a></li>
84-
<li><a href="#about">About</a></li>
85-
<li class="dropdown">
86-
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Help <span class="caret"></span></a>
87-
<ul class="dropdown-menu">
88-
<li><a href="#">Action</a></li>
89-
<li><a href="#">Another action</a></li>
90-
<li><a href="#">Something else here</a></li>
91-
<li role="separator" class="divider"></li>
92-
<li><a href="#">Separated link</a></li>
93-
<li><a href="#">One more separated link</a></li>
94-
</ul>
95-
</li>
96-
</ul>
97-
</div><!--/.nav-collapse -->
67+
<!-- Fixed navbar -->
68+
<nav class="navbar navbar-default navbar-fixed-top">
69+
<div class="container">
70+
<div class="navbar-header">
71+
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
72+
<span class="sr-only">Toggle navigation</span>
73+
<span class="icon-bar"></span>
74+
<span class="icon-bar"></span>
75+
<span class="icon-bar"></span>
76+
</button>
77+
<a class="navbar-brand" href="#">Library</a>
9878
</div>
99-
</nav>
79+
<div id="navbar" class="collapse navbar-collapse">
80+
<ul class="nav navbar-nav">
81+
<li><a href="#">Settings</a></li>
82+
<li class="dropdown">
83+
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Help <span class="caret"></span></a>
84+
<ul class="dropdown-menu">
85+
<li><a href="#">Manual</a></li>
86+
<li role="separator" class="divider"></li>
87+
<li><a href="#">About</a></li>
88+
</ul>
89+
</li>
90+
</ul>
91+
</div><!--/.nav-collapse -->
92+
</div>
93+
</nav>
10094

10195
<!-- Begin page content -->
10296
<div class="container">
10397
<div class="pageheader">
10498
</div>
10599
<h1>{%book.name%}</h1>
106-
<div class="clear-fix">[%holy.book.forward%]:<a href="{%base_url%}book/{%book.Id%}/{%lastchapter%}#up" title="{%book.name%} | 第{%lastchapter%}章">&#8249;&#8249; [%holy.book.previous%]</a> <a href="{%base_url%}book/{%book.Id%}/{%nextchapter%}#up" title="{%book.name%} | 第{%nextchapter%}章">[%holy.book.next%] &#8250;&#8250;</a> </div>
100+
<div class="clear-fix">[%book.info%]</div>
107101

102+
<div class="clear-fix">[%holy.book.forward%]:<a href="{%base_url%}book/{%book.Id%}/{%lastchapter%}#up" title="{%book.name%} | 第{%lastchapter%}章">&#8249;&#8249; [%holy.book.previous%]</a> <a href="{%base_url%}book/{%book.Id%}/{%nextchapter%}#up" title="{%book.name%} | 第{%nextchapter%}章">[%holy.book.next%] &#8250;&#8250;</a> </div>
108103
<div class="article">{%content%}</div>
104+
<div class="clear-fix">[%holy.book.forward%]:<a href="{%base_url%}book/{%book.Id%}/{%lastchapter%}#up" title="{%book.name%} | 第{%lastchapter%}章">&#8249;&#8249; [%holy.book.previous%]</a> <a href="{%base_url%}book/{%book.Id%}/{%nextchapter%}#up" title="{%book.name%} | 第{%nextchapter%}章">[%holy.book.next%] &#8250;&#8250;</a> </div>
105+
109106
</div>
110107

111-
<!-- Modal -->
112-
<div class="modal fade" id="modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
113-
<div class="modal-dialog" role="document">
114-
<div class="modal-content">
115-
<div class="modal-header">
116-
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true"></span></button>
117-
<h4 class="modal-title" id="myModalLabel">Dialog</h4>
118-
</div>
119-
<div class="modal-body">
120-
<label for="nickname">Your Name:</label><input type="text" class="form-control" name="nickname" id="nickname"/>
121-
</div>
122-
<div class="modal-footer">
123-
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
124-
<button type="button" class="btn btn-primary" id="dialog_submit">Save changes</button>
125-
</div>
126-
</div>
127-
</div>
128-
</div>
129-
<!-- Modal -->
130-
<div class="modal fade" id="topic_modal" tabindex="-1" role="dialog" aria-labelledby="ModalLabel">
131-
<div class="modal-dialog" role="document">
132-
<div class="modal-content">
133-
<div class="modal-header">
134-
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true"></span></button>
135-
<h4 class="modal-title" id="ModalLabel">Dialog</h4>
136-
</div>
137-
<div class="modal-body">
138-
<label for="brief">Topics / Questions:</label><textarea class="form-control" name="brief" id="brief"></textarea>
139-
</div>
140-
<div class="modal-footer">
141-
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
142-
<button type="button" class="btn btn-primary" id="topic_submit">Save changes</button>
143-
</div>
144-
</div>
145-
</div>
146-
</div>
147-
148108
<footer class="footer">
149109
<div class="container">
150110
<p class="text-muted"> © 2015 </p>
151111
</div>
152112
</footer>
153113

154-
<!-- Bootstrap core JavaScript
155-
================================================== -->
156-
<!-- Placed at the end of the document so the pages load faster -->
157-
<script src="http://getbootstrap.com/dist/js/bootstrap.min.js"></script>
158-
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
159-
<script src="http://getbootstrap.com/assets/js/ie10-viewport-bug-workaround.js"></script>
114+
<!-- Bootstrap core JavaScript
115+
================================================== -->
116+
<!-- Placed at the end of the document so the pages load faster -->
117+
<script src="/scripts/bootstrap/bootstrap.min.js?raw=true"></script>
118+
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
119+
<script src="/scripts/bootstrap/ie10-viewport-bug-workaround.js?raw=true"></script>
160120
</body>
161121
</html>

0 commit comments

Comments
 (0)