Permalink
Browse files

Merge branch 'master' of github.com:kcalmes/a-team

Conflicts:
	css/custom.css
  • Loading branch information...
2 parents 65ae379 + 9a1ff42 commit 13bf79abbe8faa0f63697e3f82533804eebb7729 @kcalmes committed Dec 8, 2012
View
@@ -87,6 +87,7 @@
#main-content{
/*background-color: black;*/
+ margin-bottom: 70px;
width: 100%;
/*min-height: 570px;*/
position: relative;
@@ -116,4 +117,9 @@ footer .form-search{
}
.menu ul li{
cursor: pointer;
+}
+
+#doc-upload > * {
+ display: inline-block;
+ vertical-align: middle;
}
View
@@ -19,7 +19,7 @@ background-size: 100% 100%;
text-align: center;
}
.footer-texture {
- position: absolute;
+ position: fixed;
right: 0;
left: 0;
bottom: 0;
@@ -68,3 +68,27 @@ background-size: 100% 100%;
#header .header.btn.active{
background:url(../img/top_button_active.png);
}
+
+
+#edit-header {
+ background-image: url(../img/top_grad.png);
+ /*background-size: 100% 100%;*/
+ color: white;
+ height: 70px;
+ padding-top: 10px;
+ position: relative;
+ text-align: center;
+}
+
+#edit-footer {
+ background-image: url(../img/top_grad.png);
+ background-size: 100% 100%;
+ bottom: 0;
+ box-shadow: 0px -2px 4px #7C7C7C;
+ color: white;
+ height: 70px;
+ left: 0;
+ position: fixed;
+ right: 0;
+ text-align: center;
+}
View
@@ -0,0 +1,64 @@
+<!--
+To change this template, choose Tools | Templates
+and open the template in the editor.
+-->
+<!DOCTYPE html>
+<html>
+ <head>
+ <meta charset="utf-8">
+ <title>Advisement App</title>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta name="description" content="">
+ <meta name="author" content="">
+
+ <!-- Le javascript -->
+ <script type="text/javascript" src="./js/jquery.js"></script>
+ <script type="text/javascript" src="./js/bootstrap.min.js"></script>
+ <script type="text/javascript" src="./js/ejs_production.js"></script>
+ <script type="text/javascript" src="./js/partials.js"></script>
+ <script type="text/javascript" src="./js/application.js"></script>
+ <!-- Le styles -->
+ <link href="./css/bootstrap.css" rel="stylesheet">
+ <style type="text/css">
+ body {
+ /*
+ padding-top: 60px;
+ padding-bottom: 40px;
+ */
+ }
+ </style>
+ <link href="./css/bootstrap-responsive.css" rel="stylesheet">
+ <link href="./css/theme.css" rel="stylesheet">
+ <link href="./css/custom.css" rel="stylesheet">
+ <link href="./css/dave-custom.css" rel="stylesheet">
+
+ <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
+ <!--[if lt IE 9]>
+ <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+ <![endif]-->
+
+ <!-- Fav and touch icons -->
+ <link rel="shortcut icon" href="./ico/favicon.ico">
+ <link rel="apple-touch-icon-precomposed" sizes="144x144" href="./ico/apple-touch-icon-144-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" sizes="114x114" href="./ico/apple-touch-icon-114-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" sizes="72x72" href="./ico/apple-touch-icon-72-precomposed.png">
+ <link rel="apple-touch-icon-precomposed" href="./ico/apple-touch-icon-57-precomposed.png">
+ </head>
+ <body>
+ <div id="edit-header" class="row">
+ <div class="container">
+ <div class="row">
+ <div class="span8 offset2">
+ <h3>Edit Document</h3>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div id="main-content">
+
+ </div>
+ <div id="edit-footer">
+
+ </div>
+ </body>
+</html>
View
@@ -21,11 +21,6 @@ $(function(){
// $(this).trigger('click');
// });
-
-});
-
-$(document).ready(function() {
-
$('#main-content')
.on('click', '.apt-row', function() {
$('.apt-row').removeClass('apt-selected');
View
@@ -110,7 +110,7 @@
<li><a href="#">Phys and Math Sciences</a></li>
<li><a href="#">Religious Education</a></li>-->
</ul>
- <h5 id="departmentsMenuHeader">Departments</h5>
+ <h5 id="departmentsMenuHeader">Colleges</h5>
</div>
<div id="menu-car" class="offset6 span3 menu middle">
<ul>
@@ -1,34 +1,34 @@
-<div class="container">
- <div class="row">
- <div class="span12">
- <div id="content" class="container">
-
- </div>
- <!-- <div id="resourceList">
- <table class="table table-bordered">
- <thead>
- <tr>
- <th>Title</th>
- <th>isDoc</th>
- </tr>
- <tbody>
- <% if(typeof this['apts'] !== 'undefined') { for (var index in apts) {
- var result = apts[index] %>
- <tr class="apt-row">
- <td><% result.netid %></td>
- <td><% result.time %></td>
- </tr>
- <% }} %>
- </tbody>
- </thead>
- </table>
- </div> -->
- <form class="form-search">
- <div class="input-append">
- <input type="text" class="span6 search-query" placeholder="Search for resources...">
- <button type="submit" class="btn"><i class="icon-search"></i> <span class="visible-desktop">Search</span></button>
- </div>
- </form>
- </div>
- </div>
-</div>
+<div class="container">
+ <div class="row">
+ <div class="span12">
+ <div id="content" class="container">
+
+ </div>
+ <!-- <div id="resourceList">
+ <table class="table table-bordered">
+ <thead>
+ <tr>
+ <th>Title</th>
+ <th>isDoc</th>
+ </tr>
+ <tbody>
+ <% if(typeof this['apts'] !== 'undefined') { for (var index in apts) {
+ var result = apts[index] %>
+ <tr class="apt-row">
+ <td><% result.netid %></td>
+ <td><% result.time %></td>
+ </tr>
+ <% }} %>
+ </tbody>
+ </thead>
+ </table>
+ </div> -->
+ <form class="form-search">
+ <div class="input-append">
+ <input type="text" class="span6 search-query" placeholder="Search for resources...">
+ <button type="submit" class="btn"><i class="icon-search"></i> <span class="visible-desktop">Search</span></button>
+ </div>
+ </form>
+ </div>
+ </div>
+</div>
@@ -1,7 +0,0 @@
-<div class="container">
- <div class="row">
- <div class="span12">
- <h1>Add/Edit Document</h1>
- </div>
- </div>
-</div>
View
@@ -0,0 +1,47 @@
+<div class="container" style="text-align: left;">
+<!-- <div class="row">
+ <div class="span12">
+ <h1>Add/Edit Document</h1>
+ </div>
+ </div>-->
+<!-- <div class="row">
+ <div class="span10">
+ <form class="form-horizontal">
+ <div class="control-group">
+ <label class="control-label" for="doc-name">Name: </label>
+ <div class="controls">
+ <input id="doc-name" type="text" maxlength="30" placeholder="Document name">
+ </div>
+ </div>
+ <div class="control-group">
+ <label class="control-label" for="doc-desc">Description: </label>
+ <div class="controls">
+ <input id="doc-desc" class="span6" type="text" maxlength="65" placeholder="Short description of document (65 characters)">
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>-->
+ <div class="row">
+ <div class="span10 offset1">
+ <form>
+ <fieldset>
+ <label>Name:</label>
+ <input id="doc-name" type="text" maxlength="30" placeholder="Document name">
+ <label>Description:</label>
+ <input id="doc-desc" class="span6" type="text" maxlength="65" placeholder="Short description of document (65 characters)">
+ <div id="doc-upload" class="span5">
+ <label class="span1">Document:</label>
+ <button class="btn span2 offset1">Upload new</button>
+ </div>
+ <label>Details:</label>
+ <textarea class="span10" rows="10"></textarea>
+ </fieldset>
+ </form>
+ <div class="span10">
+ <button id="doc-cancel" class="btn span3">Cancel</button>
+ <button id="doc-save" class="btn btn-primary span3 offset3">Save</button>
+ </div>
+ </div>
+ </div>
+</div>
@@ -1,7 +1,7 @@
-<div class="container">
- <div class="row">
- <div class="span12">
- <h1>Add/Edit Website</h1>
- </div>
- </div>
+<div class="container">
+ <div class="row">
+ <div class="span12">
+ <h1>Add/Edit Website</h1>
+ </div>
+ </div>
</div>

0 comments on commit 13bf79a

Please sign in to comment.