PHOTARK-41 - Applying patch from Henry Saputra to add HTML5 DOCTYPE to gallery.html and meta content type, also do fix missing images from upload.css
git-svn-id: https://svn.apache.org/repos/asf/incubator/photark/trunk@944589 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/photark-ui-admin/src/main/webapp/admin/css/upload.css b/photark-ui-admin/src/main/webapp/admin/css/upload.css
index 8dabe64..8a03f64 100644
--- a/photark-ui-admin/src/main/webapp/admin/css/upload.css
+++ b/photark-ui-admin/src/main/webapp/admin/css/upload.css
@@ -104,7 +104,7 @@
.uploadBtn{
border:1px solid #333333;
- background:url(images/buttonEnabled.png) #d0d0d0 repeat-x scroll 0px top;
+ background:url(../images/buttonEnabled.png) #d0d0d0 repeat-x scroll 0px top;
font-size:14px;
width:201px;
height:30px;
@@ -112,12 +112,12 @@
text-align:center;
}
.uploadHover{
- background-image:url(images/buttonHover.png);
+ background-image:url(../images/buttonHover.png);
cursor:pointer;
font-weight:bold;
}
.uploadPress{
- background-image:url(images/buttonActive.png);
+ background-image:url(../images/buttonActive.png);
}
.uploadDisabled{
background-image:none;
diff --git a/photark-ui-admin/src/main/webapp/admin/upload.html b/photark-ui-admin/src/main/webapp/admin/upload.html
index 9d5f8ba..7826260 100644
--- a/photark-ui-admin/src/main/webapp/admin/upload.html
+++ b/photark-ui-admin/src/main/webapp/admin/upload.html
@@ -16,16 +16,22 @@
* specific language governing permissions and limitations
* under the License.
-->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE html>
<html>
<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+
+ <title>Apache PhotArk - Upload Photos</title>
+
<script type="text/javascript" src="../dojo/dojo.js" djConfig="isDebug:false, parseOnLoad: true, debugAtAllCosts:false"></script>
<script type="text/javascript" src="../js/constants.js"></script>
- <script type="text/javascript" src="js/upload.js" charset="utf-8"></script>
+ <script type="text/javascript" src="js/upload.js"></script>
+
<link rel="stylesheet" type="text/css" href="../dijit/themes/tundra/tundra.css" />
<link href="css/upload.css" rel="stylesheet" />
- <script type="text/javascript" src="js/admin.js" charset="utf-8"></script>
+
+ <script type="text/javascript" src="js/admin.js"></script>
</head>
<body>
diff --git a/photark-ui/src/main/webapp/gallery.html b/photark-ui/src/main/webapp/gallery.html
index 75f8a2f..6b4efa4 100644
--- a/photark-ui/src/main/webapp/gallery.html
+++ b/photark-ui/src/main/webapp/gallery.html
@@ -16,8 +16,11 @@
* specific language governing permissions and limitations
* under the License.
-->
+<!DOCTYPE html>
<html>
<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+
<title>Apache PhotArk - Photo Gallery</title>
<link href="css/styles.css" rel="stylesheet">
