Skip to content

Commit

Permalink
redo commit
Browse files Browse the repository at this point in the history
  • Loading branch information
Becky Bianco authored and Becky Bianco committed Apr 5, 2011
1 parent 0c86ecf commit a582368
Show file tree
Hide file tree
Showing 8 changed files with 371 additions and 5 deletions.
Binary file added .DS_Store
View file
Binary file not shown.
11 changes: 11 additions & 0 deletions .project
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>BucketList</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>
62 changes: 62 additions & 0 deletions .tmp_index (Tamara-Fleishers-MacBook-Pro's conflicted copy 2011-03-30).html.21692~
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<!DOCTYPE>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<title>BucketList</title>

<link rel="stylesheet" href="css/bucketList.css" type="text/css">

<link href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css" rel="stylesheet" type="text/css"/>


<script src="3rdparty/jquery_1.4.2/jquery_libraries/ui/jquery.ui.core.js"></script>
<script src="3rdparty/jquery_1.4.2/jquery_libraries/ui/jquery.ui.widget.js"></script>
<script src="3rdparty/jquery_1.4.2/jquery_libraries/ui/jquery.ui.mouse.js"></script>
<script src="3rdparty/jquery_1.4.2/jquery_libraries/ui/jquery.ui.draggable.js"></script>
<script type="text/javascript" src="3rdparty/jquery_1.4.2/jquery-1.4.2.min.js"></script>
<script type="text/javascript" src="3rdparty/jquery_1.4.2/jquery_libraries/jquery-ui-1.8.5.custom.min.js"></script>

<script type="text/javascript" src="js/bucketList.js"></script>
</head>


<body>
<div id="container">
<div id="list">
Tamara Fleisher
<h2>BucketList</h2>
<div id="accordion" style="font-size:62.5%;">
<h3><a href="#">6.033</a></h3>
<div>
<input type="checkbox"><textarea class="task" id="t1">DP1</textarea><br>
<input type="checkbox"><textarea class="task" id="t2">RAID Paper</textarea><br>
<input type="checkbox"><textarea class="new" id="t3">New Task</textarea>
</div>
<h3><a href="#">6.813</a></h3>
<div>
<input type="checkbox"><textarea class="task" id="t4">Pset 3</textarea><br>
<input type="checkbox"><textarea class="task" id="t5">GR4</textarea><br>
<input type="checkbox"><textarea class="task" id="t6">Read Notes!</textarea><br>
<input type="checkbox"><textarea class="new" id="t7">New Task</textarea>
</div>
<h3><a href="#">UROP</a></h3>
<div>
Submit add form!<br><br>
Do the work!!!!!
</div>
</div>
</div>

<div id="bulletin">
<div class="sticky" id="s1">This is a note!</div>
<div class="sticky" id="s2">This is another note!</div>
</div>

<div id="taskInfo">
task info
</div>
</div>
</body>


</html>
115 changes: 115 additions & 0 deletions .tmp_index.html.43948~
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
<!DOCTYPE>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<title>BucketList</title>

<link rel="stylesheet" href="css/bucketList.css" type="text/css">

<link href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css" rel="stylesheet" type="text/css"/>

<script src="3rdparty/jquery_1.4.2/jquery_libraries/ui/jquery.ui.core.js"></script>
<script src="3rdparty/jquery_1.4.2/jquery_libraries/ui/jquery.ui.widget.js"></script>
<script src="3rdparty/jquery_1.4.2/jquery_libraries/ui/jquery.ui.mouse.js"></script>
<script src="3rdparty/jquery_1.4.2/jquery_libraries/ui/jquery.ui.draggable.js"></script>
<script type="text/javascript" src="3rdparty/jquery_1.4.2/jquery-1.4.2.min.js"></script>
<script type="text/javascript" src="3rdparty/jquery_1.4.2/jquery_libraries/jquery-ui-1.8.5.custom.min.js"></script>

<script type="text/javascript" src="js/bucketList.js"></script>

<script type="text/javascript" language="JavaScript">
var currentView = "welcome";
</script>
</head>


<body>
<div id="container">

<div id="rightSide">

<div id="taskInfo">

<div id="welcome" style="margin: 10px">
Welcome to BucketList!
</div>
<!--
<div id="b1t0n" class="hiddenFloat">
<h3 id="b1t0name"> Information about 6.033</h3>

<button type="button" id="b1t0i1" class="stickyButton hidden" onclick="addSticky('1', '0', '1')"></button>
<textarea class="new note"
id="b1t0n1"
onfocus="noteFocus('1', '0', '1')"
onblur="noteBlur('1', '0', '1')"
onkeypress="ifEnter('#b1t0n1', event)"> New Note</textarea><br>
</div>

<div id="b1t1n" class="hiddenFloat">
<h3 id="b1t1name"> Information about DP1</h3>

<button type="button" id="b1t1i1" class="stickyButton hidden" onclick="addSticky('1', '1', '1')"></button>
<textarea class="new note"
id="b1t1n1"
onfocus="noteFocus('1', '1', '1')"
onblur="noteBlur('1', '1', '1')"
onkeypress="ifEnter('#b1t1n1', event)"> New Note</textarea><br>
</div> -->
<div id="collabsBar" class="hiddenFloat">
</div>

</div> <!-- END taskInfo -->

<div id="bulletin">
</div> <!-- END bulletin -->

</div> <!-- END rightSide -->


<div id="list">
Tamara Fleisher
<h2>BucketList</h2>

<div id="accordion" style="font-size:62.5%;">

<div class="bucketGroup">
<!--
<h3><a href="#" id="b1name" onclick="setInfo('1', '0')">6.033</a></h3>
<div id="b1" class="bucket">
<input type="checkbox" id="b1c1">
<textarea class="task"
id="b1t1"
onfocus="taskFocus('1', '1')"
onblur="taskBlur('1', '1')"
onkeypress="ifEnter('#b1t1', event)"
onkeyup="taskType('1', '1')">DP1</textarea><br>

<input type="checkbox" class="hidden" id="b1c2">
<textarea class="new"
id="b1t2"
onfocus="taskFocus('2', '1')"
onblur="taskBlur('2', '1')"
onkeypress="ifEnter('#b1t2', event)"
onkeyup="taskType('2', '1')">New Task</textarea><br>
</div> <!-- END bucket -- >
-->
</div> <!-- END bucketGroup -->
</div> <!-- END accordion -->

<br>
<button type="button" class="newBucket" onclick="bucketName()">New Bucket</button><br>
<div id="bucketName" class="hidden">
Bucket Name:<br>
<textarea id="name"
onblur="addBucket()"
onkeypress="ifEnter('#name', event)"></textarea><br>
</div>
</div> <!-- END list -->

<div class="clear"></div>

</div> <!-- END container -->
</body>


</html>
175 changes: 175 additions & 0 deletions css/.tmp_bucketList.css.html67453~
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
<html><h1>The H1 tag looks like this</h1>
<p>The paragraph tag after an H1 tag looks like this</p>
<h2>The H2 tag looks like this</h2>
<p>The paragraph tag after an H2 tag looks like this</p>
<h3>The H3 tag looks like this</h3>
<p>The paragraph tag after an H3 tag looks like this</p>
<h4>The H4 tag looks like this</h4>
<p>The paragraph tag after an H4 tag looks like this</p>
<h5>The H5 tag looks like this</h5>
<p>The paragraph tag after an H5 tag looks like this</p>
<ol>
<li><strong>This is a strong element in an ordered list</strong></li>
<li><i>This is an italic element in an ordered list</i></li>
<li><b>This is a bold element in an ordered list</b></li>
<li><em>This is an emphasized element in an ordered list</em></li>
<li>This is a regular element in an ordered list</li>
</ol>
<ul>
<li><strong>This is a strong element in an unordered list</strong></li>
<li><i>This is an italic element in an unordered list</i></li>
<li><b>This is a bold element in an unordered list</b></li>
<li><em>This is an emphasized element in an unordered list</em></li>
<li>This is a regular element in an unordered list</li>
</ul>
<blockquote>The block quote element looks like this</blockquote>
<pre>The pre element looks like this</pre>
<code>The code element looks like this</code>
<br/>
<span>The span element looks like this</span>
<br/>
<a href="#">The anchor element looks like this</a>
<br/>
<br/>
<div style="float:left;margin:20px;width:200px;">Text inside a div that is 200 pixels wide looks like this. Text inside a div that is 200 pixels wide looks like this. Text inside a div that is 200 pixels wide looks like this. Text inside a div that is 200 pixels wide looks like this. Text inside a div that is 200 pixels wide looks like this. Text inside a div that is 200 pixels wide looks like this. Text inside a div that is 200 pixels wide looks like this. Text inside a div that is 200 pixels wide looks like this. Text inside a div that is 200 pixels wide looks like this. Text inside a div that is 200 pixels wide looks like this.</div>
<div style="float:left;margin:20px;width:400px;">Text inside a div that is 400 pixels wide looks like this. Text inside a div that is 400 pixels wide looks like this. Text inside a div that is 400 pixels wide looks like this. Text inside a div that is 400 pixels wide looks like this. Text inside a div that is 400 pixels wide looks like this. Text inside a div that is 400 pixels wide looks like this. Text inside a div that is 400 pixels wide looks like this. Text inside a div that is 400 pixels wide looks like this. Text inside a div that is 400 pixels wide looks like this. Text inside a div that is 400 pixels wide looks like this. Text inside a div that is 400 pixels wide looks like this. Text inside a div that is 400 pixels wide looks like this. Text inside a div that is 400 pixels wide looks like this. Text inside a div that is 400 pixels wide looks like this. Text inside a div that is 400 pixels wide looks like this. Text inside a div that is 400 pixels wide looks like this. Text inside a div that is 400 pixels wide looks like this. Text inside a div that is 400 pixels wide looks like this. Text inside a div that is 400 pixels wide looks like this. Text inside a div that is 400 pixels wide looks like this. Text inside a div that is 400 pixels wide looks like this. Text inside a div that is 400 pixels wide looks like this.</div>
<div style="float:left;margin:20px;width:600px;">Text inside a div that is 600 pixels wide looks like this. Text inside a div that is 600 pixels wide looks like this. Text inside a div that is 600 pixels wide looks like this. Text inside a div that is 600 pixels wide looks like this. Text inside a div that is 600 pixels wide looks like this. Text inside a div that is 600 pixels wide looks like this. Text inside a div that is 600 pixels wide looks like this. Text inside a div that is 600 pixels wide looks like this. Text inside a div that is 600 pixels wide looks like this. Text inside a div that is 600 pixels wide looks like this. Text inside a div that is 600 pixels wide looks like this. Text inside a div that is 600 pixels wide looks like this. Text inside a div that is 600 pixels wide looks like this. Text inside a div that is 600 pixels wide looks like this. Text inside a div that is 600 pixels wide looks like this. Text inside a div that is 600 pixels wide looks like this. Text inside a div that is 600 pixels wide looks like this. Text inside a div that is 600 pixels wide looks like this. Text inside a div that is 600 pixels wide looks like this. Text inside a div that is 600 pixels wide looks like this. Text inside a div that is 600 pixels wide looks like this. Text inside a div that is 600 pixels wide looks like this. Text inside a div that is 600 pixels wide looks like this. Text inside a div that is 600 pixels wide looks like this. Text inside a div that is 600 pixels wide looks like this. Text inside a div that is 600 pixels wide looks like this. Text inside a div that is 600 pixels wide looks like this. Text inside a div that is 600 pixels wide looks like this. Text inside a div that is 600 pixels wide looks like this. Text inside a div that is 600 pixels wide looks like this. Text inside a div that is 600 pixels wide looks like this. Text inside a div that is 600 pixels wide looks like this. Text inside a div that is 600 pixels wide looks like this.</div><style>#container {
font-family: Verdana, Arial, Helvetica, sans-serif;
background-color: #ddd;
border: 1px solid gray;
height: auto;
}

#list {
height: 100%;
width: 20%;
clear: left;
background-color: transparent;
}

#rightSide {
float: right;
height: 100%;
width: 80%;
background-color: white;
}

#bulletin {
background-image: url('../img/bulletin.jpg');
background-repeat: no-repeat;
background-size: 100%;
height: 63%;
}

#taskInfo {
padding: 1em;
background-color: transparent;
overflow-y: auto;
height: 34%;
width: 75%;
}

h2 {
text-align: center;
}

button.newBucket {
display: block;
width: 65%;
height: 30px;
margin: 0px auto;
}

#bucketName {
text-align: center;
}

#collabsBar {
position: fixed;
top: 1em;
right: 1em;
padding: 1em;
background-color: transparent;
overflow-y: auto;
height: 34%;
width: 20%;
}
.sticky {
width: 100px;
height: 100px;
position: absolute;
background-image: url('../img/sticky.jpeg');
background-repeat: no-repeat;
background-size: 100%;
padding-left: 25px;
padding-top: 30px;
padding-right: 20px;
padding-bottom: 30px;
cursor: pointer;
}

#accordian {
}

textarea {
border: none;
width: 80%;
height: 1.6em;
resize: none;
cursor: text;
}

textarea:focus {
outline: none;
}

textarea.new {
color: #aaa;
background-color: trasparent;
display:inline-block;
}

textarea.real {
color: black;
display:inline-block;
}

textarea.note {
height: 2em;
border-bottom: dashed 1px;
border-color:-moz-use-text-color;
}

textarea.stickyNote {
background: transparent;
height: inherit;
width: inherit;
}

button.disabled {
visibility: hidden;
}

.hidden {
visibility:hidden;
}

.hiddenFloat {
display: none;
float: left;
}

.bucket {
position: auto;
}

.noteButton {
float: right;

}

.clear {
clear: both;
line-height: 0px;
}
</style></html>
6 changes: 3 additions & 3 deletions css/bucketList.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
background-color: transparent;
overflow-y: auto;
height: 35%;
width: 70%;
width: 100%;
}

h2 {
Expand All @@ -50,8 +50,8 @@ button.newBucket {

#collabsBar {
position: fixed;
top: 1em;
right: 1em;
top: 1px;
right: 1px;
background-color: transparent;
overflow-y: auto;
height: 35%;
Expand Down
2 changes: 1 addition & 1 deletion index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ <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 id="collabsBar" class="hiddenFloat">
</div>

</div> <!-- END taskInfo -->
Expand Down
Loading

0 comments on commit a582368

Please sign in to comment.