Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-6219 New UI elements may request external resources (Elliot) 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1359443 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Zhihong Yu 2012-07-09 23:50:37 +00:00
parent 5236f762dd
commit 82b93c67c3
5 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
View File

@ -59,7 +59,7 @@ org.apache.hadoop.hbase.HBaseConfiguration;
<link href="/static/css/bootstrap-responsive.css" rel="stylesheet"> <link href="/static/css/bootstrap-responsive.css" rel="stylesheet">
<link href="/static/css/hbase.css" rel="stylesheet"> <link href="/static/css/hbase.css" rel="stylesheet">
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> <script src="/static/js/html5shiv.js"></script>
<![endif]--> <![endif]-->
</head> </head>
@ -229,7 +229,7 @@ org.apache.hadoop.hbase.HBaseConfiguration;
</table> </table>
</div> <!-- /container --> </div> <!-- /container -->
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js" type="text/javascript"></script> <script src="/static/js/jquery.min.js" type="text/javascript"></script>
<script src="/static/js/bootstrap.min.js" type="text/javascript"></script> <script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
</body> </body>
@ -323,4 +323,4 @@ org.apache.hadoop.hbase.HBaseConfiguration;
</tr> </tr>
</table> </table>
</%if> </%if>
</%def> </%def>

4
hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/regionserver/RSStatusTmpl.jamon
View File

@ -57,7 +57,7 @@ org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionLoad;
<link href="/static/css/hbase.css" rel="stylesheet"> <link href="/static/css/hbase.css" rel="stylesheet">
<link href="/static/css/bootstrap-responsive.css" rel="stylesheet"> <link href="/static/css/bootstrap-responsive.css" rel="stylesheet">
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> <script src="/static/js/html5shiv.js"></script>
<![endif]--> <![endif]-->
</head> </head>
@ -155,7 +155,7 @@ org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionLoad;
</tr> </tr>
</table> </table>
</div> </div>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js" type="text/javascript"></script> <script src="/static/js/jquery.min.js" type="text/javascript"></script>
<script src="/static/js/bootstrap.min.js" type="text/javascript"></script> <script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
</body> </body>
</html> </html>

14
hbase-server/src/main/resources/hbase-webapps/master/table.jsp
View File

@ -76,7 +76,7 @@
<link href="/static/css/hbase.css" rel="stylesheet"> <link href="/static/css/hbase.css" rel="stylesheet">
<link href="/static/css/bootstrap-responsive.css" rel="stylesheet"> <link href="/static/css/bootstrap-responsive.css" rel="stylesheet">
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> <script src="/static/js/html5shiv.js"></script>
<![endif]--> <![endif]-->
<meta http-equiv="refresh" content="5,javascript:history.back()" /> <meta http-equiv="refresh" content="5,javascript:history.back()" />
</head> </head>
@ -135,6 +135,8 @@
%> %>
<p>Go <a href="javascript:history.back()">Back</a>, or wait for the redirect. <p>Go <a href="javascript:history.back()">Back</a>, or wait for the redirect.
</div> </div>
<script src="/static/js/jquery.min.js" type="text/javascript"></script>
<script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
</body> </body>
<% <%
} else { } else {
@ -148,14 +150,10 @@
<link href="/static/css/bootstrap.css" rel="stylesheet"> <link href="/static/css/bootstrap.css" rel="stylesheet">
<style> <link href="/static/css/hbase.css" rel="stylesheet">
body {
padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
}
</style>
<link href="/static/css/bootstrap-responsive.css" rel="stylesheet"> <link href="/static/css/bootstrap-responsive.css" rel="stylesheet">
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> <script src="/static/js/html5shiv.js"></script>
<![endif]--> <![endif]-->
</head> </head>
<body> <body>
@ -363,6 +361,8 @@ Actions:
<% <%
} }
%> %>
<script src="/static/js/jquery.min.js" type="text/javascript"></script>
<script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
</body> </body>
</html> </html>

5
hbase-server/src/main/resources/hbase-webapps/master/tablesDetailed.jsp
View File

@ -41,7 +41,7 @@
<link href="/static/css/hbase.css" rel="stylesheet"> <link href="/static/css/hbase.css" rel="stylesheet">
<link href="/static/css/bootstrap-responsive.css" rel="stylesheet"> <link href="/static/css/bootstrap-responsive.css" rel="stylesheet">
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> <script src="/static/js/html5shiv.js"></script>
<![endif]--> <![endif]-->
</head> </head>
@ -98,5 +98,8 @@
</table> </table>
<% } %> <% } %>
</div> </div>
<script src="/static/js/jquery.min.js" type="text/javascript"></script>
<script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
</body> </body>
</html> </html>

4
hbase-server/src/main/resources/hbase-webapps/master/zk.jsp
View File

@ -48,7 +48,7 @@
<link href="/static/css/hbase.css" rel="stylesheet"> <link href="/static/css/hbase.css" rel="stylesheet">
<link href="/static/css/bootstrap-responsive.css" rel="stylesheet"> <link href="/static/css/bootstrap-responsive.css" rel="stylesheet">
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> <script src="/static/js/html5shiv.js"></script>
<![endif]--> <![endif]-->
</head> </head>
<body> <body>
@ -90,6 +90,8 @@
</div> </div>
</div> </div>
</div> </div>
<script src="/static/js/jquery.min.js" type="text/javascript"></script>
<script src="/static/js/bootstrap.min.js" type="text/javascript"></script>
</body> </body>
</html> </html>