Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

Conflicts:
	index.html
  • Loading branch information...
commit 30cbb558130d4af3f4023232fc47ab7440e4fc18 2 parents 42f520d + 3f79e63
@kcalmes authored
View
22 css/custom.css
@@ -87,7 +87,7 @@
#main-content{
/*background-color: black;*/
- margin-bottom: 70px;
+ margin-bottom: 90px;
width: 100%;
/*min-height: 570px;*/
position: relative;
@@ -96,9 +96,13 @@
#main-content-login{
/*background-color: black;*/
+ bottom: 0;
+ left: 0;
+ /*min-height: 800px;*/
+ position: absolute;
+ right: 0;
+ top: 0;
width: 100%;
- min-height: 800px;
- position: relative;
z-index: 0;
}
@@ -122,4 +126,16 @@ footer .form-search{
#doc-upload > * {
display: inline-block;
vertical-align: middle;
+}
+
+#doc-upload .btn {
+ margin-left: 10px;
+}
+
+#edit-btns .btn {
+ width: 100px;
+}
+
+#doc-save {
+ margin-left: 25px;
}
View
11 css/dave-custom.css
@@ -68,14 +68,7 @@ a.acc-row:hover {
#menu-acad {
margin-top: -330px;
}
-#menu-depts {
- margin-top: -375px;
-}
-
-#menu-car {
- margin-top: -280px;
-}
-#menu-acad {
- margin-top: -390px;
+#manage-recs .btn {
+ width: 115px;
}
View
11 css/theme.css
@@ -72,12 +72,15 @@ background-size: 100% 100%;
#edit-header {
background-image: url(../img/top_grad.png);
- /*background-size: 100% 100%;*/
+ background-size: 100% 100%;
color: white;
height: 70px;
+ left: 0;
padding-top: 10px;
- position: relative;
+ position: fixed;
+ right: 0;
text-align: center;
+ top: 0;
}
#edit-footer {
@@ -91,4 +94,8 @@ background-size: 100% 100%;
position: fixed;
right: 0;
text-align: center;
+}
+
+#main-content.edit-doc {
+ margin-top: 100px;
}
View
6 edit.html
@@ -27,7 +27,7 @@
*/
}
</style>
- <link href="./css/bootstrap-responsive.css" rel="stylesheet">
+ <!--<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">
@@ -49,12 +49,12 @@
<div class="container">
<div class="row">
<div class="span8 offset2">
- <h3>Edit Document</h3>
+ <h3 id="edit-title"></h3>
</div>
</div>
</div>
</div>
- <div id="main-content">
+ <div id="main-content" class="edit-doc">
</div>
<div id="edit-footer">
View
22 js/application.js
@@ -86,6 +86,28 @@ function loadDocCategory(searchQuery, headerToClose) {
$('#' + headerToClose).trigger('click');
}
+// A second method for retrieving the stuff from Lawrence's webservice, and we can all test it
+// It doesn't quite work the way we would neeed it to because of the format of the webservice response
+function loadDocSearch2(searchQuery) {
+ var url = "http://www.williamsware.com/cs/searchService.php?query=" + searchQuery;
+
+ var bigUrl = "http://query.yahooapis.com/v1/public/yql?q=select%20*%20from%20html%20where%20url%3D%22" + encodeURIComponent(url) + "%22&format=json&callback=";
+
+ $.ajax({
+ url: bigUrl,
+ datatype: 'json',
+ success: function(data) {
+ alert("success?");
+ var string = JSON.stringify(data.query.results.body.p);
+ var sub = string.substr(1,string.length - 2)
+ var sub2 = sub.replace(/\\/g,"");
+// $('#main-content').text(sub2);
+// var results = JSON.parse(sub2);
+ new EJS({url: './pages/advisors/aResource.ejs'}).update('content', sub2);
+ }
+ });
+}
+
//24 - 16 - 11
//1250 + 1000
View
2  pages/advisors/aResource.ejs
@@ -1,6 +1,6 @@
<div class="row">
<div class="span6 offset3">
- <h4>Documents:</h4>
+ <h4>Resources:</h4>
<div id="resourceList">
<table class="table table-bordered">
<thead>
View
21 pages/advisors/resources/manage.ejs
@@ -1,8 +1,19 @@
-<div class="container">
+<div id="manage-recs" class="container" style="text-align: left">
<div class="row">
- <div class="span12">
- <h1>Manage Resources</h1>
- <a href="#advisors/resources/editdoc">Add Document</a> | <a href="#advisors/resources/editweb">Add Website</a>
+ <div class="span6 offset3">
+ <h3>Manage Resources</h3>
+ <a class="btn" onclick="setTitle('Add Document')" href="edit.html#edit/doc">Add Document</a> <a class="btn" href="edit.html#edit/website">Add Website</a>
</div>
</div>
-</div>
+ <div class="row">
+ <div id="all-recs" class="span12">
+
+ </div>
+ </div>
+</div>
+
+<script>
+
+ new EJS({url: './pages/advisors/aResource.ejs'}).update('all-recs', './pages/advisors/resources/resources.json');
+
+</script>
View
1  pages/advisors/resources/resources.json
@@ -0,0 +1 @@
+results = [{ "url":"http://www.ipfw.edu/academics/advising/top-10-for-ipfw-faculty.pdf", "title":"Top 10 Things Faculty Should Know Related to Advising", "isDoc":"1" }, { "url":"https://ppa.byu.edu/sites/ppa.byu.edu/files/New%20PPA%20Website%20Content/Premanagement/Handouts/Why%20a%20MBA.pdf", "title":"Why an MBA should be in Your Future", "isDoc":"1" }, { "url":"https://ppa.byu.edu/sites/ppa.byu.edu/files/New%20PPA%20Website%20Content/Premanagement/Handouts/GMAT%2C%20information.pdf", "title":"The GMAT", "isDoc":"1" }, { "url":"https://ppa.byu.edu/sites/ppa.byu.edu/files/New%20PPA%20Website%20Content/Premanagement/Handouts/How%20do%20I%20know%20if%20an%20MBA%20is%20for%20me.pdf", "title":"How do I know if an MBA is for me?", "isDoc":"1" }, { "url":"https://ppa.byu.edu/", "title":"Pre Professional Advisement Center", "isDoc":"0" }, { "url":"http://saas.byu.edu/catalog/2012-2013ucat/PDFCatalog/Full Catalog.pdf", "title":"Undergrad Catalog 2012-2013", "isDoc":"1" }, { "url":"https://ucs.byu.edu/students/networking", "title":"Networking", "isDoc":"0" }, { "url":"http://saas.byu.edu/catalog/2012-2013ucat/current_grad_catalog.pdf", "title":"Graduate Catalog 2012-2013", "isDoc":"1" }, { "url":"https://ucs.byu.edu/colleges/hum", "title":"College of Humanities", "isDoc":"0" }, { "url":"https://ucs.byu.edu/colleges/cet", "title":"Fulton College of Engineering and Technology", "isDoc":"0" }, { "url":"https://ucs.byu.edu/colleges/fhss", "title":"College of Family, Home & Social Science", "isDoc":"0" }, { "url":"https://ucs.byu.edu/colleges/fac", "title":"College of Fine Arts & Communications", "isDoc":"0" }, { "url":"https://universityadvisement.byu.edu/graduate-school", "title":"Graduate School", "isDoc":"0" }, { "url":"https://ucs.byu.edu/colleges/international", "title":"Kennedy Center for International Studies", "isDoc":"0" }, { "url":"https://ucs.byu.edu/students/interviewing/after", "title":"After the Interview", "isDoc":"0" }, { "url":"http://saas.byu.edu/intern/", "title":"BYU Internship Office", "isDoc":"0" }, { "url":"http://commsinternships.byu.edu/", "title":"Communications Internships", "isDoc":"0" }, { "url":"http://education.byu.edu/ess/", "title":"Education Internships", "isDoc":"0" }, { "url":"http://sot.et.byu.edu/advisement/internships", "title":"Engineering and Technology Internships", "isDoc":"0" }, { "url":"http://fhssinternships.byu.edu/", "title":"Family, Home and Social Sciences Internships", "isDoc":"0" }, { "url":"http://saas.byu.edu/classschedule/pdf/clsschedFULL20125.pdf", "title":"Fall 2012 Course Schedule", "isDoc":"1" }, { "url":"http://www.physics.byu.edu/faculty/rees/220/documents/outline.htm", "title":"Sample Course Outline", "isDoc":"0" }, { "url":"http://saas.byu.edu/advisement/map.php", "title":"All Major Academic Plans", "isDoc":"0" }, { "url":"http://saas.byu.edu/advisement/maps/map12-13.php?college=Education", "title":"Education MAPs", "isDoc":"0" }, { "url":"http://saas.byu.edu/advisement/maps/map12-13.php?college=EngrTech", "title":"Engineering and Technology MAPs", "isDoc":"0" }, { "url":"http://saas.byu.edu/advisement/maps/map12-13.php?college=FHSS", "title":"Family, Home, and Social Science MAPs", "isDoc":"0" }, { "url":"", "title":"", "isDoc":"0" }, { "url":"http://saas.byu.edu/advisement/maps/map12-13.php?college=FAC", "title":"Fine Arts and Communications MAPs", "isDoc":"0" }, { "url":"http://saas.byu.edu/advisement/maps/map12-13.php?college=Humanities", "title":"Humanities MAPs", "isDoc":"0" }, { "url":"http://saas.byu.edu/advisement/maps/map12-13.php?college=IAS", "title":"International and Area Studies MAPs", "isDoc":"0" }, { "url":"http://homeworktips.about.com/od/preparingforcollege/a/majors.htm", "title":"College Major Quiz", "isDoc":"0" }, { "url":"http://www.usnews.com/education/best-colleges/articles/2011/09/19/5-ways-to-pick-the-right-college-major", "title":"5 Ways to Pick the Right College Major", "isDoc":"0" }, { "url":"https://universityadvisement.byu.edu/choose-a-major", "title":"Choose a Major", "isDoc":"0" }, { "url":"https://ccc.byu.edu/", "title":"Counseling and Career Center", "isDoc":"0" }, { "url":"http://www.byui.edu/academic-discovery-center/students/career-and-major-exploration/career-and-major-exploration-classes", "title":"Career and Major Exploration Classes", "isDoc":"0" }, ]
View
36 pages/edit/doc.ejs
@@ -1,3 +1,18 @@
+
+
+<script>
+ var title = { title: "Add Document"};
+ var type = {
+ upper: "Document",
+ lower: "document"
+ };
+
+ new EJS({url: './pages/edit/title.ejs'}).update('edit-title', title);
+
+ new EJS({url: './pages/edit/form.ejs'}).update('edit-form', type);
+
+</script>
+
<div class="container" style="text-align: left;">
<!-- <div class="row">
<div class="span12">
@@ -23,25 +38,8 @@
</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 id="edit-form" class="span10 offset1">
+
</div>
</div>
</div>
View
23 pages/edit/form.ejs
@@ -0,0 +1,23 @@
+<form>
+ <fieldset>
+ <label>Name:</label>
+ <input id="doc-name" type="text" maxlength="30" placeholder="<%= upper %> name">
+ <label>Description:</label>
+ <input id="doc-desc" class="span6" type="text" maxlength="65" placeholder="Short description of <%= lower %> (65 characters)">
+ <% if (lower == 'document') { %>
+ <div id="doc-upload" class="">
+ <label class="">Document:</label>
+ <button class="btn btn-small">Upload</button>
+ </div>
+ <% } else { %>
+ <label>Website URL:</label>
+ <input id="doc-desc" class="span6" type="text" placeholder="URL of <%= lower %>">
+ <% } %>
+<!-- <label class="">Details:</label>
+ <textarea class="span10" rows="10"></textarea>-->
+ </fieldset>
+</form>
+<div id="edit-btns" class="">
+ <a id="doc-cancel" class="btn" href="pages.html#advisors/resources/manage">Cancel</a>
+ <a id="doc-save" class="btn btn-primary" href="pages.html#advisors/resources/manage">Save</a>
+</div>
View
1  pages/edit/title.ejs
@@ -0,0 +1 @@
+<%= title %>
View
48 pages/edit/website.ejs
@@ -1,7 +1,45 @@
-<div class="container">
- <div class="row">
- <div class="span12">
- <h1>Add/Edit Website</h1>
+
+
+<script>
+ var title = { title: "Add Website"};
+ var type = {
+ upper: "Website",
+ lower: "website"
+ };
+
+ new EJS({url: './pages/edit/title.ejs'}).update('edit-title', title);
+
+ new EJS({url: './pages/edit/form.ejs'}).update('edit-form', type);
+
+</script>
+
+<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 id="edit-form" class="span10 offset1">
+
+ </div>
</div>
- </div>
</div>
Please sign in to comment.
Something went wrong with that request. Please try again.