diff --git a/.tmp_index.html.26494~ b/.tmp_index.html.26494~ new file mode 100644 index 0000000..665c4b2 --- /dev/null +++ b/.tmp_index.html.26494~ @@ -0,0 +1,120 @@ + + + + + BucketList + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ +
+ +
+
+ +
+
+
+
+
+
+ +
+ +
+
+ +
+ + +
+ Tamara Fleisher + + +
+ +
+ +
+
+ +
+
+ +
+ +
+ +
+ + + + \ No newline at end of file diff --git a/css/.tmp_bucketList.css.html30468~ b/css/.tmp_bucketList.css.html30468~ new file mode 100644 index 0000000..47ef13d --- /dev/null +++ b/css/.tmp_bucketList.css.html30468~ @@ -0,0 +1,193 @@ +

The H1 tag looks like this

+

The paragraph tag after an H1 tag looks like this

+

The H2 tag looks like this

+

The paragraph tag after an H2 tag looks like this

+

The H3 tag looks like this

+

The paragraph tag after an H3 tag looks like this

+

The H4 tag looks like this

+

The paragraph tag after an H4 tag looks like this

+
The H5 tag looks like this
+

The paragraph tag after an H5 tag looks like this

+
    +
  1. This is a strong element in an ordered list
    2. +
  2. This is an italic element in an ordered list
    3. +
  3. This is a bold element in an ordered list
    4. +
  4. This is an emphasized element in an ordered list
    5. +
  5. This is a regular element in an ordered list
    6. +
+ +
The block quote element looks like this
+
The pre element looks like this
+The code element looks like this +
+The span element looks like this +
+The anchor element 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. Text inside a div that is 200 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. Text inside a div that is 400 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. Text inside a div that is 600 pixels wide looks like this.
\ No newline at end of file diff --git a/css/bucketList.css b/css/bucketList.css index c84a2c1..9934cab 100644 --- a/css/bucketList.css +++ b/css/bucketList.css @@ -1,7 +1,10 @@ #container { font-family: Verdana, Arial, Helvetica, sans-serif; + font: "Gill Sans MT"; background-color: #ddd; border: 1px solid gray; + -moz-border-radius: 15px; + border-radius: 15px; height: 100%; } @@ -9,28 +12,44 @@ height: 100%; width: 20%; clear: left; - background-color: transparent; + -moz-border-radius: 15px; + border-radius: 15px; + background-color: #e6dcaf; + background-image: url('../img/featured_transparent_fade.png'); + background-size: 100%; } #rightSide { float: right; height: 100%; width: 80%; - background-color: white; + background-color: #d4d9e3; + background-size: 100%; + -moz-border-radius: 15px; + border-radius: 15px; +} + +#logo { + width: 105%; + display: block; + margin-top: 20px; + margin-bottom: 20px; + margin-left: 3px; } #bulletin { background-image: url('../img/bulletin.jpg'); background-repeat: repeat; background-size: 100%; - height: 65%; + -moz-border-radius: 15px; + border-radius: 15px; + height: 60%; } #taskInfo { background-color: transparent; overflow-y: auto; - height: 35%; - width: 100%; + height: 40%; } h2 { @@ -48,20 +67,26 @@ button.newBucket { text-align: center; } -#collabsBar { - position: fixed; - top: 1px; - right: 1px; - background-color: transparent; - overflow-y: auto; - height: 35%; - width: 20%; +#notesBox{ + float: left; + width: 70%; +} + +#extras { + float:right; + font-size:10pt; + margin:10px; } + +.dueOptBox { + border: 2px ridge gray; +} + .sticky { width: 100px; - height: 100px; + height: 128px; position: absolute; - background-image: url('../img/sticky.jpeg'); + background-image: url('../img/sticky.gif'); background-repeat: no-repeat; background-size: 100%; padding-left: 25px; @@ -70,6 +95,14 @@ button.newBucket { cursor: pointer; } +.stickyButton{ + cursor: pointer; +} + +.collabsBox { + border: 5px solid gray; +} + #accordian { } diff --git a/img/.DS_Store b/img/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/img/.DS_Store differ diff --git a/img/addStickyIcon.gif b/img/addStickyIcon.gif index 2590c5c..ade5737 100644 Binary files a/img/addStickyIcon.gif and b/img/addStickyIcon.gif differ diff --git a/img/featured_transparent_fade.png b/img/featured_transparent_fade.png new file mode 100644 index 0000000..832da20 Binary files /dev/null and b/img/featured_transparent_fade.png differ diff --git a/img/logo.gif b/img/logo.gif new file mode 100644 index 0000000..15309fb Binary files /dev/null and b/img/logo.gif differ diff --git a/img/nobucketLogo.gif b/img/nobucketLogo.gif new file mode 100644 index 0000000..0649e29 Binary files /dev/null and b/img/nobucketLogo.gif differ diff --git a/img/sticky.gif b/img/sticky.gif new file mode 100644 index 0000000..7e47cc6 Binary files /dev/null and b/img/sticky.gif differ diff --git a/index.html b/index.html index a01e0c5..665c4b2 100644 --- a/index.html +++ b/index.html @@ -31,8 +31,9 @@
- Welcome to BucketList! +
+
-
+
+
+
+
+
@@ -68,7 +73,7 @@

Information about DP1

Tamara Fleisher -

BucketList

+
diff --git a/js/bucketList.js b/js/bucketList.js index ff1c240..b0d42f0 100644 --- a/js/bucketList.js +++ b/js/bucketList.js @@ -7,9 +7,17 @@ $(document).ready(function(){ // This function sets the taskInfo pannel to contain the appropriate information // It is called when a bucket or task in the left list is clicked function setInfo(bucket, task) { - $('#'+currentView).addClass('hiddenFloat'); - currentView = 'b'+bucket+'t'+task+'n'; - $('#'+currentView).removeClass('hiddenFloat'); + if (currentView == "welcome") { + $('#'+currentView).addClass('hiddenFloat'); + } else{ + $('#' + currentView + 'n').addClass('hiddenFloat'); + $('#' + currentView + 'c').addClass('hiddenFloat'); + $('#' + currentView + 'd').addClass('hiddenFloat'); + } + currentView = 'b'+bucket+'t'+task; + $('#'+currentView+'n').removeClass('hiddenFloat'); + $('#'+currentView+'c').removeClass('hiddenFloat'); + $('#'+currentView+'d').removeClass('hiddenFloat'); } @@ -182,7 +190,7 @@ function addBucket() { } function addTaskToInfo(bucket, task, name) { - var html = "
" + var notes = "
" + "

Information about " + name + "

" + "New Note
"; - var html2 = "

Collaborators

"; + var collabs = "
" + + "

Collaborators

" + + "
Becky
"; + var due = "
" + + "

Due Date Options

" + + "
Due Date: " + + "Enter the due date here." + + "
Remind me days in advance.
"; - $("#taskInfo").append(html); - $("#collabsBar").append(html2); - + $("#notesBox").append(notes); + $("#collabsBar").append(collabs); + $("#dueOptions").append(due); + } function addBucketToInfo(bucket, name) { - var html = "
" + var notes = "
" + "

Information about " + name + "

" + "New Note
"; - var html2 = "

Collaborators

"; + var collabs = "
" + + "

Collaborators

" + + "
Becky
"; - $("#taskInfo").append(html); - $("#collabsBar").append(html2); - -} + var due = "
"; + $("#notesBox").append(notes); + $("#collabsBar").append(collabs); + $("#dueOptions").append(due); -function getInfoHTML(bucket, task, name) { - var html = "
" - + "

Information about " + name + "

" - + "" - - + "
"; } function ifEnter(field, event) {