Minor formatting and moving style definition to admin.css
git-svn-id: https://svn.apache.org/repos/asf/incubator/photark/trunk@905177 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/photark-ui-admin/src/main/webapp/admin/admin.css b/photark-ui-admin/src/main/webapp/admin/admin.css
index e4f8f69..2963f07 100644
--- a/photark-ui-admin/src/main/webapp/admin/admin.css
+++ b/photark-ui-admin/src/main/webapp/admin/admin.css
@@ -22,11 +22,19 @@
@import "../dijit/themes/tundra/form/Button.css";
@import "../dojox/form/resources/FileInput.css";
-body, html {
+body, html {
+ width: 100%;
+ height: 100%;
+ margin: 0;
font-family:Verdana,helvetica,arial,sans-serif;
font-size:90%;
}
+#borderContainerTwo {
+ width: 100%;
+ height: 100%;
+}
+
.top {
background-color:black;
}
diff --git a/photark-ui-admin/src/main/webapp/admin/admin.html b/photark-ui-admin/src/main/webapp/admin/admin.html
index eadbe12..557dd75 100644
--- a/photark-ui-admin/src/main/webapp/admin/admin.html
+++ b/photark-ui-admin/src/main/webapp/admin/admin.html
@@ -17,80 +17,77 @@
* under the License.
-->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html dir="ltr">
-
- <head>
- <script type="text/javascript" src="../dojo/dojo.js" djConfig="isDebug:false, parseOnLoad: true, debugAtAllCosts:false"></script>
- <script type="text/javascript" src="uploader.js" charset="utf-8"></script>
- <script type="text/javascript" src="admin.js" charset="utf-8"></script>
- <link rel="stylesheet" type="text/css" href="../dijit/themes/tundra/tundra.css">
- <link href="admin.css" rel="stylesheet">
- <style type="text/css">
- html, body { width: 100%; height: 100%; margin: 0; }
- #borderContainerTwo
- { width: 100%; height: 100%; }
- </style>
-
- <script type="text/javascript">
-
- var d = {
- identifier: 'name',
- label: 'name',
- items: [
- { name:'Create New Album', type:'album' },
- { name:'Upload Photo', type:'album' }
- ]
- };
-
- var folders = new dojo.data.ItemFileReadStore({ data: d });
+<html>
- var folderModel = new dijit.tree.ForestStoreModel({
- store: folders,
- query: { type: "album" },
- childrenAttrs: [ "children" ]
- });
+<head>
+<script type="text/javascript" src="../dojo/dojo.js" djConfig="isDebug:false, parseOnLoad: true, debugAtAllCosts:false"></script>
+<script type="text/javascript" src="uploader.js" charset="utf-8"></script>
+<script type="text/javascript" src="admin.js" charset="utf-8"></script>
+
+<link rel="stylesheet" type="text/css" href="../dijit/themes/tundra/tundra.css">
+<link href="admin.css" rel="stylesheet">
+
+<script type="text/javascript">
+
+ var d = {
+ identifier: 'name',
+ label: 'name',
+ items: [
+ { name:'Create New Album', type:'album' },
+ { name:'Upload Photo', type:'album' }
+ ]
+ };
+
+ var folders = new dojo.data.ItemFileReadStore({ data: d });
+
+ var folderModel = new dijit.tree.ForestStoreModel({
+ store: folders,
+ query: { type: "album" },
+ childrenAttrs: [ "children" ]
+ });
-
- var gallery = new dojo.rpc.JsonService( "/photark/Gallery?smd" );
-
- function createAlbum(){
- var albumLabel = newAlbumForm.attr('value');
- console.log("albumLabel:"+albumLabel);
- var albumName;
- for(var key in albumLabel){
- albumName = albumLabel[key];
- console.log("albumName:"+albumName);
- }
+
+ var gallery = new dojo.rpc.JsonService( "/photark/Gallery?smd" );
+
+ function createAlbum(){
+ var albumLabel = newAlbumForm.attr('value');
+ console.log("albumLabel:"+albumLabel);
+ var albumName;
+ for(var key in albumLabel){
+ albumName = albumLabel[key];
console.log("albumName:"+albumName);
- gallery.addAlbum(albumName);
- dojo.byId('albumCreated').innerHTML = "Album Successfully Created:" + albumName;
- dojo.byId('albumName').value = "";
}
+ console.log("albumName:"+albumName);
+ gallery.addAlbum(albumName);
+ dojo.byId('albumCreated').innerHTML = "Album Successfully Created:" + albumName;
+ dojo.byId('albumName').value = "";
+ }
- function populateSelect(){
- gallery.getAlbums().addCallback(gallery_getAlbumsResponse);
- }
+ function populateSelect(){
+ gallery.getAlbums().addCallback(gallery_getAlbumsResponse);
+ }
- function gallery_getAlbumsResponse(albums, exception) {
+ function gallery_getAlbumsResponse(albums, exception) {
if(exception) {
alert(exception.msg);
return;
}
+
var select = dijit.byId('selectalbum');
var options = new dojo.data.ItemFileWriteStore({data: {identifier: 'name', items:[]}});
-
- for (var i=0; i < albums.length; i++) {
- options.newItem({name: albums[i].name});
- }
+
+ for (var i=0; i < albums.length; i++) {
+ options.newItem({name: albums[i].name});
+ }
select.attr('store', options);
}
- </script>
- </head>
-
- <body class="tundra ">
- <!-- Inline declaration for programmatically created "Upload Photo" -->
+</script>
+</head>
+
+<body class="tundra ">
+ <!-- Inline declaration for programmatically created "Upload Photo" -->
<!-- Inline declaration for programmatically created "New Message" tabs -->
<div dojoType="dijit.Declaration" widgetClass="album.Upload">
<div dojoType="dijit.TitlePane" region="center" dojoAttachPoint="container" title="Upload Photo">
