Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@gwheaton
gwheaton committed Mar 8, 2012
1 parent 7ee25d7 commit bb161b8
Show file tree
Hide file tree
Showing 5 changed files with 98 additions and 145 deletions.
Binary file added add_bg.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified bg.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
144 changes: 58 additions & 86 deletions default.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,119 +9,91 @@ body {
color: white;
}

#wrapper {
width: 1024px;
height: 780px;
display: block;
margin: 0 auto;

}



#hRight {
position: absolute;
height: 98px;
right: 0px;
top: 0px;
}

#hRight img {
margin: auto 10px;
position: relative;
top: 30px;
}

#cannedLogin {
float: right;
margin-left: 20px;
margin-right: 20px;
line-height: 100px;
}

#cannedLogin a {
font-weight: bold;
text-decoration: none;
color: #ff9933;
#contentMain {
width: 800px;
height: 500px;
margin: 30px auto 0px auto;
}


#description {
width: 400px;
resize: none;
}

#pform {
position:absolute;
top:100px;
left:100px;
display:none;
border:2px solid blue;
padding:8px;
canvas {
width: 100%;
height: 100%;
}


header {
height: 100px;
width: 100%;
background-color: rgba(0,0,0,0.7);
position: relative;
}

footer {
display: block;
clear: both;
text-align: center;
border-top: 1px solid gray;
padding: 10px;
width: 600px;
}

nav {
display: block;
float: right;
position: relative;
width: 20px;
height: auto;
width: 600px;
margin: auto;
}

article {
nav ul {
padding: 0px;
list-style-type: none;
width: auto;
margin: auto 0px;
}

nav li {
position: relative;
top: 30px;
float: left;
width: 600px;
width: 150px;
height: 40px;
}

li {
padding-left: 20px;
margin-bottom: 10px;
#dd {
width: 350px;
font-weight: bold;
text-shadow: 1px 1px rgba(0,0,0,1);
}

h1 {
font-weight: normal;
color: indigo;
text-shadow: white 0px 1px 2px;
nav li img {
display: inline-block;
margin-left: 10px;
margin-right: 10px;
}

#description {
width: 338px;
resize: none;
}

nav ul {
margin: 0px;
padding: 20px 20px 0 0;
#pform {
display:none;
position: absolute;
}

nav li {
font-weight: bold;
background: blue;
border-radius: 20px;
margin: 9px 0 400px 0;
list-style-type: none;
padding: 9px;
text-align:center
#add {
padding: 5px;
background-image: url(add_bg.png);
background-repeat: repeat-x;
-moz-border-radius: 10px;
border-radius: 10px;
}

nav li a {
color: white;
#cannedLogin {
float: right;
margin: 10px;
}

a:link { text-decoration: none; }
a:hover { text-decoration: underline; }
a:active { text-decoration: underline; }
a:visited { text-decoration: none; }
#cannedLogin a {
font-weight: bold;
text-decoration: none;
color: #ff9933;
}


footer {
display: block;
clear: both;
text-align: center;
padding: 12px;
}
87 changes: 36 additions & 51 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,72 +3,57 @@
<head>
<title>Save the Bubble!</title>
<link rel="stylesheet" href="default.css">
<script type="text/javascript" src="main.js"></script>
<script type="text/javascript" src="main.js"></script>
</head>

<body onLoad="initprompt();">
<div id="wrapper">
<header>

<!-- logo -->
<img src="Stb_Logo_nobg.png" height=100 width=auto alt="Save the Bubble">
<div id="hRight">
<img src="add event.png" alt="Add an Event" onclick="prompt()">
<!-- <form id="pForm">
Event: <input type="text" name="event" size="35" placeholder="Enter your event" /><br><br>
Date: <input type="text" name="date" maxlength="8" placeholder="##/##/##" /><br><br>
Time: <input type="text" name="time" maxlength="10" placeholder="ex: 12:00 P.M." /><br><br>
Description: <textarea name="script" rows="10" columns="300" placeholder="Enter a description of your event" id="description"></textarea><br><br>
Will food be provided?:<input type="checkbox" name="food" /> <br><br>
<input type="button" value="Submit" onclick="getPdata()" />
<input type="button" value="Cancel" onclick="initprompt()" />
</form> -->
<img src="my events.png" alt="My Events">
<div id="cannedLogin">George123 | <a href="">Sign Out</a></div>
</div>

<!-- Nav links -->
<nav>
<ul>
<li><img src="my events.png" alt="My Events" onclick="setup('myEvents');"></li>
<li id="dd">
<img src="add event.png" alt="Add an Event" onclick="prompt()">
<div id="cannedLogin">George123 | <a href="">Sign Out</a></div>
<form id="pForm"></br></br>
<div id="add">
Event Name: </br><input type="text" name="event" size="35" placeholder="Enter your event" /><br><br>
Date: </br><input type="text" name="date" maxlength="8" placeholder="##/##/##" /><br><br>
Time: </br><input type="text" name="time" maxlength="10" placeholder="ex: 12:00 P.M." /><br><br>
Category: <br>
<input type="radio" name="category" value="Academics"> Academics <br>
<input type="radio" name="category" value="Athletics"> Athletics <br>
<input type="radio" name="category" value="Music"> Music <br>
<input type="radio" name="category" value="Theater"> Theater <br>
<input type="radio" name="category" value="Miscellaneous"> Miscellaneous <br><br>
Description: </br><textarea name="script" rows="10" columns="400" placeholder="Enter a description of your event (250 characters or less)" maxlength="250" id="description"></textarea><br><br>
Will food be provided?:<input type="checkbox" name="food" /> <br><br>
<input type="button" value="Submit" onclick="getPdata()" />
<input type="button" value="Cancel" onclick="initprompt()" />
</div>
</form>
</li>
</ul>
</nav>
</header>


<!-- left nav items -->
<nav>
<!-- UL stands for unordered list -->
<ul>
<button type="button" onclick="setup('category1');">Category1</button>
<button type= "button" onclick="setup('myEvents');">My Events</button>
<form>
<input type="button" value="Add a Bubble" onclick="prompt()" />
</form>
<form id="pForm">
Event: <input type="text" name="event" size="35" placeholder="Enter your event" /><br><br>
Date: <input type="text" name="date" maxlength="8" placeholder="##/##/##" /><br><br>
Time: <input type="text" name="time" maxlength="10" placeholder="ex: 12:00 P.M." /><br><br>
Category: <br>
<input type="radio" name="category" value="Academics"> Academics <br>
<input type="radio" name="category" value="Athletics"> Athletics<br>
<input type="radio" name="category" value="Music"> Music<br>
<input type="radio" name="category" value="Theater"> Theater<br>
<input type="radio" name="category" value="Miscellaneous"> Miscellaneous<br><br>
Description: <textarea name="script" rows="10" columns="300" placeholder="Enter a description of your event (250 characters or less)" maxlength="250" id="description"></textarea><br><br>
Will food be provided?:<input type="checkbox" name="food" /> <br><br>
<input type="button" value="Submit" onclick="getPdata()" />
<input type="button" value="Cancel" onclick="initprompt()" />
</form>
</ul>

</nav>


<!-- HTML5 article tag -->
<article>
<div style="width:1022px;height:500px;border:1px solid #000;">
<div style="width:1022px;height:500px;border:1px solid #000; margin:30px auto 0px auto;">
<canvas id="canvas" height="500" width="1022"></canvas>
</div>
</article>

<footer>
<ul>


</div>
<button type="button" onclick="setup('category1');">Click Me!</button>
<form>
</ul>
&#169 Team George
</footer>

</body>
</html>
12 changes: 4 additions & 8 deletions main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,19 +75,15 @@ function Bubble(x, y, event) {
context.textBaseline = "middle";
context.textAlign = "center";
context.font = "14px arial, sans-serif";
context.fillText(this.event.name.substring(0,30), xmid, ymid-200);
context.fillText(this.event.name.substr(0,15), xmid, ymid-200);
context.fillText("Date:", xmid-120, ymid-150);
context.fillText(this.event.date.substring(0,15), xmid-50, ymid-150);
context.fillText(this.event.date.substr(0,15), xmid-50, ymid-150);
context.fillText("Time:", xmid+50, ymid-150);
context.fillText(this.event.time.substr(0,15), xmid+120, ymid-150);
context.fillText("Description:", xmid, ymid-100);
context.fillText(this.event.descrip.substring(0,50), xmid, ymid-50);
context.fillText(this.event.descrip.substring(50,100), xmid, ymid-25);
context.fillText(this.event.descrip.substring(100,150), xmid, ymid);
context.fillText(this.event.descrip.substring(150,200), xmid, ymid+25);
context.fillText(this.event.descrip.substring(200,251), xmid, ymid+50);
context.fillText(this.event.descrip.substr(0,15), xmid, ymid-50);
context.fillText("Add to My Events", 430, 415);
context.fillText("Pop Bubble", 600, 415);
context.fillText("Pop Bubble", 610, 415);
if (this.event.food) {
context.fillText("*Food will be provided", xmid-130, ymid+120);
}
Expand Down

0 comments on commit bb161b8

Please sign in to comment.