Skip to content

Commit

Permalink
First prototype. Group pages now have title and about us added.
Browse files Browse the repository at this point in the history
  • Loading branch information
valderrama committed Oct 2, 2011
1 parent 0d242be commit 78dd393
Show file tree
Hide file tree
Showing 14 changed files with 404 additions and 6 deletions.
Binary file added app/assets/images/ASSU_iCal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/Members.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/StanfordBackground.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/group_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/nav-item.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/plus.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions app/assets/javascripts/compat.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
$(document).ready(function () {
function sizeBgImage() {
var width = $(document).width();
var height = $(document).height();
var sizeString = width + 'px';

$(document.body).css({
'background-image': 'url(/assets/StanfordBackground.jpg)',
'background-repeat': 'no-repeat',
'background-attachment': 'fixed',
'background-size': sizeString
});
};
sizeBgImage();
$(window).resize(sizeBgImage);
});
4 changes: 4 additions & 0 deletions app/assets/javascripts/jquery-1.6.4.min.js

Large diffs are not rendered by default.

43 changes: 43 additions & 0 deletions app/assets/stylesheets/clickables.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/* Nav tabs */
#nav .bottom .item {
background: transparent url(/assets/nav-item.png) no-repeat bottom center;
height: 60px;
width: 202px;
text-align: center;
float: left;
position: relative;
left: 60px;
z-index: 0;
}

#nav .bottom .item > p {
padding-top: 20px;
}

#nav .bottom .item:last-child {
left: 0px;
}

#nav .bottom .item.current {
z-index: 1;
}

/* Buttons */
.button {
color: #e05e61;
text-transform: uppercase;
font-weight: bold;
font-size: 16px;
padding: 8px;
background-image: -webkit-gradient(linear, left top, left bottom, from(white), to(#e7e7e7));
background-image: -moz-linear-gradient(270deg, white 0%, #e7e7e7 100%);
-moz-box-shadow: 0 2px 5px #515151;
-webkit-box-shadow: 0 2px 5px #515151;
box-shadow: 0 2px 5px #515151;
border-radius: 8px;
}

.plus-img {
margin-left: 8px;
vertical-align: -3px;
}
95 changes: 95 additions & 0 deletions app/assets/stylesheets/text.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
/* =========== */
/* = Headers = */
/* =========== */

.large-red {
color: #AB013A;
font-size: 20px;
font-weight: bold;
}

.medium-red {
color: #AB013A;
font-size: 16px;
font-weight: bold;
}

.small-red {
color: #AB013A;
font-size: 12px;
font-weight: bold;
}

.small-black {
color: #303030;
font-size: 14px;
font-weight: bold;
margin-bottom: 5px;
}

.medium-black {
color: #303030;
font-size: 20px;
font-weight: bold;
margin-top: 5px;
margin-bottom: 8px;
}

.medium-grey {
color: #515151;
font-size: 20px;
font-weight: bold;
margin-top: 5px;
margin-bottom: 8px;
}

/* ========= */
/* = Other = */
/* ========= */

.large-caps {
text-transform: uppercase;
font-weight: bold;
font-size: 20px;
}

/* ========== */
/* = Colors = */
/* ========== */

.green {
color: #369239;
}

.blue {
color: #405EBE;
}

.red {
color: #AB013A;
}

/* ================== */
/* = Wrapper Styles = */
/* ================== */

.text-block {
background-color: #FFF;
box-shadow: #222 0 1px 6px inset;
padding: 15px;
margin-bottom: 15px;
}




#nav .top a {
padding: 6px;
font-weight: bold;
font-family: Helvetica, sans-serif;
font-size: 13px;
color: #68a3d8;
box-shadow: inset 0 1px 3px #527697;
border-radius: 8px;
width:100px;
}
1 change: 1 addition & 0 deletions app/controllers/groups_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ def index
# GET /groups/1.json
def show
@group = Group.find(params[:id])
@group_name = @group.visible_name

respond_to do |format|
format.html # show.html.erb
Expand Down
134 changes: 129 additions & 5 deletions app/views/groups/show.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,129 @@
<p id="notice"><%= notice %></p>


<%= link_to 'Edit', edit_group_path(@group) %> |
<%= link_to 'Back', groups_path %>
<div id="wrapper">
<div id="header">
<div style="text-align: center;">
<%= image_tag("logo.png", :alt => "logo", :class => "", :id => "logo-img", :width => "188", :height => "92" ) %>

</div>

<div id="search-wrapper">
<input type="search" placeholder="Search Everything" class="big-search" autosave='plaza-search' results = 5 incremental="incremental" />
</div>

<div id="nav">
<div class="top">
<a>Alex Atallah&nbsp;&nbsp;|&nbsp;&nbsp;Sign out</a>
</div>
<div class="bottom">
<div class="item">
<p class="large-caps blue">Profile</p>
</div>
<div class="item current">
<p class="large-caps green">Groups</p>
</div>
</div>
</div>
</div>
<div id="content">
<div id="content-top" class="large-caps red">
<%= @group.visible_name %>
<span class="button" style="float: right; opacity: 0;">
Follow<%= image_tag("plus.png", :alt => "plus", :class => "plus-img", :id => "") %>
</span>
</div>
<div id="content-left">
<div class="heading">
<div class="medium-grey" style="float: left">Info:</div>
<span class="button" style="float: right">Edit Info</span>
<div class="clear"></div>
</div>
<div style="text-align: center">
<%= image_tag("group_logo.png", :alt => "Members", :class => "", :id => "", :width => "70%") %>
</div>
<div class="text-block">
<p class="small-black">About us</p>
<p><%= @group.description %></p>
</div>
<div class="text-block" style="text-align: left">
<p class="small-black" style="text-align: left">Members</p>
<ul style="margin-left: 20px">
<li>Someone</li>
<li>Someone else</li>
</ul>
<!-- <img src="images/Members.png" width="165" height="108" alt="Members" />-->
</div>
<p class="small-black">Website</p>
<p class="small-black">Email</p>
</div>

<div id="content-center">
<div class="heading">
<div class="medium-grey" style="float: left">Posts:</div>
<span class="button" style="float: right">
New Post<%= image_tag("plus.png", :alt => "plus", :class => "plus-img", :id => "") %>
</span>
<div class="clear"></div>
</div>
<div class="text-block">
<p class="medium-black">Blog Post</p>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut sed tortor et erat faucibus aliquet quis id tellus. Sed augue magna, bibendum et suscipit vulputate, mattis in eros. Donec bibendum eleifend lacus, a consectetur nisl aliquam ac. Nam ut odio ac velit feugiat mattis ac vel massa. Sed dapibus laoreet lectus, a tempus quam porta at. Donec ornare dictum libero, sit amet blandit tortor condimentum ac. Donec sodales placerat est. Aenean a turpis at tortor auctor congue. Nunc interdum dapibus justo non mattis. In mattis nisi eget lacus iaculis egestas. Sed quam eros, ultricies consequat pharetra id, vulputate vel risus. Suspendisse potenti. Donec eros eros, congue non aliquet ac, cursus id lectus.</p>
</div>
<div class="text-block">
<p class="medium-black">Blog Post 2</p>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut sed tortor et erat faucibus aliquet quis id tellus. Sed augue magna, bibendum et suscipit vulputate, mattis in eros. Donec bibendum eleifend lacus, a consectetur nisl aliquam ac. Nam ut odio ac velit feugiat mattis ac vel massa. Sed dapibus laoreet lectus, a tempus quam porta at. Donec ornare dictum libero, sit amet blandit tortor condimentum ac. Donec sodales placerat est. Aenean a turpis at tortor auctor congue. Nunc interdum dapibus justo non mattis. In mattis nisi eget lacus iaculis egestas. Sed quam eros, ultricies consequat pharetra id, vulputate vel risus. Suspendisse potenti. Donec eros eros, congue non aliquet ac, cursus id lectus.</p>
</div>
</div>

<div id="content-right">
<div class="heading">
<div class="medium-grey" style="float: left">Events:</div>
<span class="button" style="float: right">
New Event<%= image_tag("plus.png", :alt => "plus", :class => "plus-img", :id => "") %>
</span>
<div class="clear"></div>
</div>

<div class="text-block">
<%= image_tag("ASSU_iCal.png", :alt => "iCal", :class => "ical", :id => "") %>
<strong>Event name</strong>
<p>Time</p>
<p>Location</p>
</div>

<div class="text-block">
<%= image_tag("ASSU_iCal.png", :alt => "iCal", :class => "ical", :id => "") %>
<strong>Event name</strong>
<p>Time</p>
<p>Location</p>
</div>

<div class="text-block">
<%= image_tag("ASSU_iCal.png", :alt => "iCal", :class => "ical", :id => "") %>
<strong>Event name</strong>
<p>Time</p>
<p>Location</p>
</div>

<div class="text-block">
<%= image_tag("ASSU_iCal.png", :alt => "iCal", :class => "ical", :id => "") %>
<strong>Event name</strong>
<p>Time</p>
<p>Location</p>
</div>

<div class="medium-grey">Past Events:</div>
<div class="text-block">
<strong>Event name</strong>
<p>Date and Time</p>
<p>Location</p>
</div>

<div class="text-block">
<strong>Event name</strong>
<p>Date and Time</p>
<p>Location</p>
</div>

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

0 comments on commit 78dd393

Please sign in to comment.