Fixed some stuff

tfleish · Apr 5, 2011 · 0c86ecf · 0c86ecf
1 parent a231c03
commit 0c86ecf
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 16 deletions.
diff --git a/css/bucketList.css b/css/bucketList.css
@@ -2,7 +2,7 @@
   font-family: Verdana, Arial, Helvetica, sans-serif;
   background-color: #ddd;
   border: 1px solid gray;
-  height: auto;
+  height: 100%;
 }
 
 #list {
@@ -21,16 +21,16 @@
 
 #bulletin {
   background-image: url('../img/bulletin.jpg');
-  background-repeat: no-repeat;
+  background-repeat: repeat;
   background-size: 100%;
   height: 65%;
 }
 
 #taskInfo {
-  padding: 1em;
   background-color: transparent;
   overflow-y: auto; 
-  height: 34%;
+  height: 35%;
+  width: 70%;
 }
 
 h2 {
@@ -48,6 +48,15 @@ button.newBucket {
   text-align: center;
 }
 
+#collabsBar {
+	position: fixed;
+	top: 1em;
+	right: 1em;
+	background-color: transparent;
+	overflow-y: auto; 
+	height: 35%;
+	width: 20%;
+}
 .sticky {
   width: 100px;
   height: 100px;
@@ -56,9 +65,8 @@ button.newBucket {
   background-repeat: no-repeat;
   background-size: 100%;
   padding-left: 25px;
-  padding-top: 30px;
+  padding-top: 28px;
   padding-right: 20px;
-  padding-bottom: 30px;
   cursor: pointer;
 }
 
@@ -110,6 +118,7 @@ button.disabled {
 
 .hiddenFloat {
   display: none;
+  float: left;
 }
 
 .bucket {

diff --git a/index.html b/index.html
@@ -30,7 +30,7 @@
 
       	    <div id="taskInfo">
 
-		      <div id="welcome">
+		      <div id="welcome" style="margin: 10px">
 		            Welcome to BucketList!
 		      </div>
 		       <!--    
@@ -55,9 +55,11 @@ <h3 id="b1t1name"> Information about DP1</h3>
                       onblur="noteBlur('1', '1', '1')"
                       onkeypress="ifEnter('#b1t1n1', event)"> New Note</textarea><br>
           </div> -->
-
+            <div id="collabsBar">	
+			</div>
+
         </div> <!-- END taskInfo -->
-      	
+
       	<div id="bulletin">
       	</div> <!-- END bulletin -->
 

diff --git a/js/bucketList.js b/js/bucketList.js
@@ -108,7 +108,7 @@ function noteBlur(bucket, task, note) {
     $(pNoteId).removeClass('new');
     $(pIconId).removeClass('hidden');
 
-    var newIcon = "<img src=\"../img/addStickyIcon.gif\""
+    var newIcon = "<img src=\"img/addStickyIcon.gif\""
                            + "id='b"+bucket+"t"+task+"i"+newNoteNum+"' "
                            + "class='stickyButton hidden' "
                            + "onclick=\"addSticky('"+bucket+"', '"+task+"', '"+newNoteNum+"')\"></img>";
@@ -183,8 +183,8 @@ function addBucket() {
 
 function addTaskToInfo(bucket, task, name) {
   var html = "<div id='b"+bucket+"t"+task+"n' class='hiddenFloat'>"
-              + "<h3 id='b"+bucket+"t"+task+"name'> Information about " + name + "</h3>"
-              + "<img src=\"../img/addStickyIcon.gif\" "
+              + "<h3 id='b"+bucket+"t"+task+"name' style='margin: 10px'> Information about " + name + "</h3>"
+              + "<img src=\"img/addStickyIcon.gif\" "
                          + "id='b"+bucket+"t"+task+"i1' "
                          + "class='stickyButton hidden' "
                          + "onclick=\"addSticky('"+bucket+"', '"+task+"', '1')\"></img>"
@@ -193,16 +193,19 @@ function addTaskToInfo(bucket, task, name) {
                            + "id='b"+bucket+"t"+task+"n1'"
                            + "onfocus=\"noteFocus('"+bucket+"', '"+task+"', '1')\" "
                            + "onblur=\"noteBlur('"+bucket+"', '"+task+"', '1')\""
-                           + "onkeypress=\"ifEnter('#b"+bucket+"t"+task+"n1', event)\">New Note</textarea><br></div>" ;
+                           + "onkeypress=\"ifEnter('#b"+bucket+"t"+task+"n1', event)\">New Note</textarea><br></div>";
+
+	var html2 = "<div id='b"+bucket+"t"+task+"colls' float: right;>Collaborators</div>";
+
     $("#taskInfo").append(html);
+	$("#collabsBar").append(html2);
 
 }
 
-
 function addBucketToInfo(bucket, name) {
   var html = "<div id='b"+bucket+"t0n' class='hiddenFloat'>"
-              + "<h3 id='b"+bucket+"t0name'> Information about " + name + "</h3>"
-              + "<img src=\"../img/addStickyIcon.gif\" "
+              + "<h3 id='b"+bucket+"t0name' style='margin: 10px'> Information about " + name + "</h3>"
+              + "<img src=\"img/addStickyIcon.gif\" "
                          + "id='b"+bucket+"t0i1' "
                          + "class='stickyButton hidden' "
                          + "onclick=\"addSticky('"+bucket+"', '0', '1')\"></img>"
@@ -216,6 +219,21 @@ function addBucketToInfo(bucket, name) {
   $("#taskInfo").append(html);
 }
 
+function getInfoHTML(bucket, task, name) {
+	  var html = "<div id='b"+bucket+"t"+task+"n' class='hiddenFloat'>"
+              + "<h3 id='b"+bucket+"t"+task+"name' style='margin: 10px'> Information about " + name + "</h3>"
+              + "<img src=\"img/addStickyIcon.gif\" "
+                         + "id='b"+bucket+"t"+task+"i1' "
+                         + "class='stickyButton hidden' "
+                         + "onclick=\"addSticky('"+bucket+"', '"+task+"', '1')\"></img>"
+
+              + "<textarea class='new note'"
+                           + "id='b"+bucket+"t"+task+"n1'"
+                           + "onfocus=\"noteFocus('"+bucket+"', '"+task+"', '1')\" "
+                           + "onblur=\"noteBlur('"+bucket+"', '"+task+"', '1')\""
+                           + "onkeypress=\"ifEnter('#b"+bucket+"t"+task+"n1', event)\">New Note</textarea><br></div>";
+}
+
 function ifEnter(field, event) {
   var theCode = event.keyCode ? event.keyCode : event.which ? event.which : event.charCode;
   if (theCode == 13){