merged changes

edgware/static/css/files/browse.css

@@ -1,6 +1,7 @@
 
+
 #filterForm
-{padding:18px;}
+{padding:18px 0px 18px 100px;}
 
 #filterForm p
 {padding-bottom:10px;
@@ -8,8 +9,22 @@ padding-right:40px;
 font-size:14px;
 float:left;}
 
+#leftCol
+{float:left;
+clear:both;}
+
+#fileList
+{width:250px; /*given same width as fileItem, so change accordingly*/
+height:272px;
+overflow:hidden;}
+
 .fileItem
 {width:250px; /*is this width ok*/
+font-size:12px;
+padding-bottom:8px;
+padding-left:100px;
+cursor:pointer;
+clear:both;
 text-align:justify;
 overflow:hidden;
 white-space:nowrap;
@@ -18,13 +33,6 @@ text-overflow:ellipsis;} /*I SUGGEST you have icon, checkbox and then text so a
 #withSelected, #firstPage, #lastPage, #pageData
 {font-size:12px;}
 
-.fileItem
-{font-size:12px;
-padding-bottom:8px;
-padding-left:18px;
-cursor:pointer;
-clear:both;}
-
 .fileItem:hover
 {color:#555353;}
 
@@ -38,7 +46,7 @@ clear:both;}
 {padding-right:4px;} /*any way to change the bottom margin*/
 
 #pageData
-{padding-top:16px;
+{padding-top:2px;
 padding-left:16px;
 font-style:italic;}
 
@@ -71,16 +79,15 @@ padding-top:18px;}
 #withSelected
 {padding-top:12px;
 padding-left:16px;
-clear:both;}
+clear:both;
+float:left;}
 
 #em
 {font-style:italic;}
 
-
-#previewPane {
-  position:absolute;
-  left:350px;
-  top:154px;}
+#previewPane 
+{float:left;
+padding-top:6px;} /*Sanj, is this okay??*/
 
 .previewObject a, .previewObject a:link
 {text-decoration:none;
@@ -96,7 +103,9 @@ color:#555353;}
 .previewObject a:active
 {color:#000;}
 
+.itemForm p
+{padding-top:12px;}
+
 .itemForm p span
 {font-size:12px;
-padding-top:6px;
 font-weight:bold;}

edgware/templates/files/browser.html

@@ -7,8 +7,7 @@
 {% endblock %}
 
 {% block content %}
-    <div id="leftCol">
-      <div id="fileFilters">
+    <div id="fileFilters">
         <form id="filterForm">
           {{ filterForm.as_p }}
           <p>
@@ -17,6 +16,7 @@
           </p>
         </form>
       </div>
+    <div id="leftCol">
       <div id="fileWrapper">
         <div id="fileList">
         
@@ -30,10 +30,10 @@
         <div id="lastPage">Last</div>
 		<div id="withSelected">
           Selected Items: <button id="deleteSelectedBtn">Delete</button>
-          &nbsp;&nbsp;<span id="em">OR</span> &nbsp;&nbsp;Move to:
+         <p id="em">OR</p> <p>Move to:
 			<select id="moveSelectedSelect">
 				<option value="">...............</option>
-			</select>
+			</select></p>
         </div>      
       </div>      
     </div>