You are viewing a plain text version of this content. The canonical link for it is here.
Posted to photark-commits@incubator.apache.org by lr...@apache.org on 2010/02/28 19:17:38 UTC
svn commit: r917257 - in
/incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin: admin.css
admin.html admin.js upload.css upload.html uploader.js
Author: lresende
Date: Sun Feb 28 19:17:38 2010
New Revision: 917257
URL: http://svn.apache.org/viewvc?rev=917257&view=rev
Log:
Enhancments to upload ui, and clean up unused code/styles/etc
Added:
incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.css (with props)
Removed:
incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/admin.css
incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/admin.html
incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/admin.js
incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/uploader.js
Modified:
incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.html
Added: incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.css
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.css?rev=917257&view=auto
==============================================================================
--- incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.css (added)
+++ incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.css Sun Feb 28 19:17:38 2010
@@ -0,0 +1,96 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ @charset "UTF-8";
+ body {
+ font:13px/1.231 arial,helvetica,clean,sans-serif,verdana;
+ *font-size:small;
+ *font:x-small;
+ color: #888888;
+ background-color: #000000;
+ margin-top: 0px;
+ /*margin and padding on body element
+ can introduce errors in determining
+ element position and are not recommended;
+ we turn them off as a foundation for YUI
+ CSS treatments. */
+ margin:0;
+ padding:0;
+ }
+
+
+ #fileToUpload{
+ border:#CCCCCC 1px solid;
+ overflow-y:auto;
+ overflow-x:hidden;
+ }
+
+ #uploadedFiles{
+ border:#CCCC00 1px solid;
+ background:#FFFFCC;
+ }
+
+ .leftCol{
+ width:500px;
+ padding:5px;
+ vertical-align:top;
+ }
+
+ #newAlbum {
+ clear: both;
+ width: 80%;
+ background-color: #F2EFE9;
+ }
+
+ textarea {
+ width: 600px;
+ height: 120px;
+ border: 3px solid #cccccc;
+ padding: 5px;
+ font-family: Tahoma, sans-serif;
+ background-position: bottom right;
+ background-repeat: no-repeat;
+ overflow: auto;
+ }
+
+ fieldset {
+ /*float: left;*/
+ clear: both;
+ width: 80%;
+ length:
+ /*margin: 0 0 -1em 0;*/
+ /*padding: 0 0 1em 0;*/
+ padding: 10px;
+ margin: 0 0 0 0;
+ border-style: none;
+ border-top: 2px solid #BFBAB0;
+ border-bottom: 2px solid #BFBAB0;
+ background-color: #F2EFE9;
+ }
+
+ fieldset ol {
+ padding-top: 0.25em;
+ list-style:none;
+ }
+
+ fieldset li {
+ padding-bottom: 1em;
+ list-style:none;
+ }
+
Propchange: incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.css
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.html
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.html?rev=917257&r1=917256&r2=917257&view=diff
==============================================================================
--- incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.html (original)
+++ incubator/photark/trunk/photark-ui-admin/src/main/webapp/admin/upload.html Sun Feb 28 19:17:38 2010
@@ -23,7 +23,7 @@
<script type="text/javascript" src="../dojo/dojo.js" djConfig="isDebug:false, parseOnLoad: true, debugAtAllCosts:false"></script>
<script type="text/javascript" src="upload.js" charset="utf-8"></script>
-<link href="admin.css" rel="stylesheet">
+<link href="upload.css" rel="stylesheet">
<style type="text/css">
.uploadBtn{
@@ -80,27 +80,31 @@
</head>
<body>
-
- <label>Select Album:</label>
- <select id="selectAlbum" name="selectAlbum" autoComplete="true"/>
-
- </br>
-
- <div id="divNewAlbum">
- <label>New Album:</label>
- <input id="newAlbumName" name="newAlbumName">
- </div>
-
- </br>
- </br>
- </br>
-
-
- <div id="btnUploader" class="uploadBtn btn">Select Files</div>
-
- <label>Files:</label>
- <div id="files" class="field"></div>
-
- <div id="btnUpload" class="uploadBtn btn" onClick="doUpload();">Upload</div>
+ <div id="newAlbum">
+ <fieldset id="newAlbumDetails">
+ <legend>Album Details</legend>
+ <ol>
+ <li>
+ <label for="selectAlbum">Select Album:</label>
+ <select id="selectAlbum" name="selectAlbum" autoComplete="true"/>
+ <label>New Album:</label>
+ <input type="text" class="text" name="newAlbumName" id="newAlbumName">
+ </li>
+ <li>
+ <label for="albumDescription">Album Description</label>
+ <textarea cols="25" rows="5" class="textarea" name="albumDescription" id="albumDescription"/>
+ </textarea>
+ </li>
+ <li>
+ <label>Files:</label>
+ <div id="files" class="field"></div>
+ </li>
+ <li>
+ <div id="btnUploader" class="uploadBtn btn">Select Files</div>
+ <div id="btnUpload" class="uploadBtn btn" onClick="doUpload();">Upload</div>
+ </li>
+ </ol>
+ </fieldset>
+ </div>
</body>
</html>
\ No newline at end of file