Skip to content

Commit

Permalink
Merge pull request #40 from ObjectiveTruth/calendar_material_design
Browse files Browse the repository at this point in the history 
General Refactor
  • Loading branch information
@ObjectiveTruth
ObjectiveTruth authored Sep 5, 2016
2 parents 93282f8 + c7c62cb commit b91d033
Show file tree
Hide file tree
Showing 51 changed files with 2,721 additions and 1,707 deletions.
8 changes: 0 additions & 8 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,6 @@ dependencies {
provided 'javax.annotation:jsr250-api:1.0'
// Logging library
compile 'com.jakewharton.timber:timber:3.1.0'
// Library for making a standardized flatUI style
compile 'com.github.eluleci:flatui:3.0.0'
// Horizontal Listview used for the Column Headers
compile 'it.sephiroth.android.library.horizontallistview:hlistview:1.2.2'
// An Event bus for communicating between fragments
compile 'com.squareup:otto:1.3.8'
// For simple animations anywhere in the app
compile 'com.nineoldandroids:library:2.4.0'
compile 'com.daimajia.easing:library:1.0.1@aar'
Expand All @@ -224,8 +218,6 @@ dependencies {
compile 'org.immutables:gson:2.1.16'
// For quickly generating about pages
compile 'com.github.medyo:android-about-page:1.0'
// For usage with OKHTTP3 to pesist the cookies
compile 'com.github.franmontiel:PersistentCookieJar:v0.9.3'
// Crashlytics for logging production logs
compile('com.crashlytics.sdk.android:crashlytics:2.5.1@aar') {
transitive = true;
Expand Down
9 changes: 0 additions & 9 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,6 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".ActivityRoomInteraction"
android:configChanges="keyboardHidden|orientation|screenSize"
android:launchMode="standard"
android:windowSoftInputMode="stateHidden" >
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.objectivetruth.uoitlibrarybooking.MainActivity" />
</activity>
<meta-data
android:name="com.crashlytics.ApiKey"
android:value="33f64deb44c8b23abaa0e0b5ba951b29710f027f" />
Expand Down
Binary file removed app/src/main/assets/infocache
View file
Binary file not shown.
272 changes: 272 additions & 0 deletions app/src/main/assets/mock_responses/book.aspx
View file

Large diffs are not rendered by default.

272 changes: 272 additions & 0 deletions app/src/main/assets/mock_responses/book_fail_message.aspx
View file

Large diffs are not rendered by default.

228 changes: 228 additions & 0 deletions app/src/main/assets/mock_responses/book_success_message.aspx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,228 @@


<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
<head>
<meta charset="utf-8"/>
<meta content="width=device-width, initial-scale=1.0" name="viewport"/>
<title>Campus Libraries | Library - Home</title>
<meta content="0324d225cdd3b53700d84d10660a66f6" name="PageID"/>
<meta content="Campus Libraries" name="description"/>
<meta content="Campus Libraries" name="keywords"/>
<link href="https://uoit.ca/favicon.ico" rel="icon" type="image/x-icon"/>

<link href="global.css" rel="stylesheet"/>
<!--[if lte IE 9]>
<link href="globalie.css" media="all" rel="stylesheet"/>
<![endif]-->
<link href="https://shared.uoit.ca/global/files/css/print.css" media="print" rel="stylesheet"/>
<link href="https://shared.uoit.ca/global/files/css/library.css" rel="stylesheet"/>
<script src="https://shared.uoit.ca/global/files/js/jquery.js" type="text/javascript"></script>
</head>
<body class="nav-on-left">
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-12659975-1', 'auto');
ga('send', 'pageview');
</script>
<a href="#main_content" id="btn_skip_to_content" tabindex="1">Skip to main content</a>
<!-- COPY FROM HERE TO END -->
<header class="cd-main-header">
<section class="topWrapper_nav">
<div class="emergencyInfo">
<div> <a href="http://uoit.ca/emergency" onclick="ga('send','event','button','click','topNav_emergencyInfo');">Emergency information</a> </div>
</div>
<nav class="top_nav" role="navigation">
<div class="row">
<div class="top_links">
<ul>
<li>
<div class="nav_col_title"><span>Quick</span> <span>links</span></div>
</li>
<li>
<ul>
<li><a href="http://uoit.ca/main/current-students/academics-and-programs/academic-calendars/index.php">Academic Calendar</a></li>
<li><a href="http://accessibility.uoit.ca">Accessibility</a></li>
<li><a href="https://uoit.blackboard.com">Blackboard</a></li>
<li><a href="http://uoit.ca/faculty_staff/campus_services/facilities/campus_services/campus-bookstore.php">Bookstore</a></li>
</ul>
</li>
<li>
<ul>
<li><a href="http://uoit.ca/maps">Campus map</a></li>
<li><a href="http://uoit.ca/main/current-students/services/campus-safety/index.php">Campus safety</a></li>
<li><a href="http://uoit.ca/main/future-students/undergraduate/campus-tours-and-events/index.php">Campus tours</a></li>
<li><a href="https://hr.uoit.ca/working_at_uoit/careers">Career opportunities</a></li>
</ul>
</li>
<li>
<ul>
<li><a href="http://uoit.ca/contact-us.php">Contact us</a></li>
<li><a href="http://uoit.ca/faculty_staff/index.php">Faculty and staff</a></li>
<li><a href="http://www.uoit.ca/sites/library/">Library</a></li>
<li><a href="http://itsc.uoit.ca/">IT services</a></li>
</ul>
</li>
<li>
<ul>
<li><a href="http://uoit.ca/mycampus/">MyCampus</a></li>
<li><a href="http://uoit.ca/directory/">UOIT Directory</a></li>
<li><a href="http://mail.uoit.net/">UOITnet</a></li>
<li><a href="http://www.uoitridgebacks.com/">Ridgebacks</a></li>
</ul>
</li>
</ul>
</div>
</div>
</nav>
</section>
<div class="toggle_top_nav"> <a class="btn_toggleTopSection" href="https://uoit.ca" id="btn_uoitHome" onclick="ga('send','event','button','click','topNav_uoitHome');"><span>UOIT Home</span></a>
<button class="btn_toggleTopSection" id="btn_toggleTopNav" onclick="ga('send','event','button','click','topNav_quickLinks');"><span>Quick links</span></button>
<button class="btn_toggleTopSection" id="btn_toggleSearch" onclick="ga('send','event','button','click','topNav_search');"><span>Search</span></button>
</div>
<div class="nav_row">
<div class="logoTitle"> <a href="http://library.uoit.ca" title="UOIT Library home page"> <img alt="University of Ontario Institute of Technology logo" src="https://shared.uoit.ca/global/files/img/logos/UOIT_RGB.png"/><img alt="University of Ontario Institute of Technology logo" id="logo_shield" src="https://shared.uoit.ca/global/files/img/logos/UOIT_blue_shield.png"/><span>Library<br/>
&#160;</span></a> </div>

<!-- Primary navigation -->

<nav class="cd-nav" role="navigation">
<ul id="cd-primary-nav" class="cd-primary-nav is-fixed">
<li><a href="http://uoit.ca/sites/library/research_help/index.php" class="">Research Help</a></li>
<li><a href="http://uoit.ca/sites/library/resources/index.php" class="">Resources</a></li>
<li><a href="http://uoit.ca/sites/library/services/index.php">Services</a></li>
<li><a href="http://uoit.ca/sites/library/faculty/index.php" class="">Faculty and Staff</a></li>
<li><a href="http://uoit.ca/sites/library/students/index.php" class="">Students</a></li>
<li><a href="http://uoit.ca/sites/library/about_the_library/index.php" class="">About</a></li>
</ul>
</nav>
<div class="cd-header-buttons">
<button class="cd-nav-trigger">Menu</button>
</div>
</div>
</header>
<!-----------START MAIN CONTENT ----------------------->

<section class="cd-main-content" id="main_content" style="margin-top: 0px;">
<nav aria-label="Breadcrumbs" class="breadcrumbs" role="menubar">
<li role="menuitem"><a href="http://www.uoit.ca/library">Home</a></li>
<li class="current" role="menuitem"><a href="https://rooms.library.dc-uoit.ca/uoit_studyrooms/calendar.aspx">Study Room Booking</a></li>
</nav>
<div class="grid">
<section class="page_content medium-9 medium-push-3 columns">
<div> <!---------------------------------------------------------------------------------------->

<form method="post" action="./message.aspx" id="Form1" style="height: 264px">
<div class="aspNetHidden">
<input type="hidden" name="__VIEWSTATE" id="__VIEWSTATE" value="HGFrsLKQ6DkBMj2Ap+79uGeGnjpd6c+nijXEg45ImshGcXWvUhNG4n+Wj+GWVYeVxO9YbR5IfYlKzcvmH/b1UvBTKTaTdpKSlum4tKFZThM=" />
</div>

<div class="aspNetHidden">

<input type="hidden" name="__VIEWSTATEGENERATOR" id="__VIEWSTATEGENERATOR" value="81CB8549" />
<input type="hidden" name="__EVENTVALIDATION" id="__EVENTVALIDATION" value="7M32xT8YTvfiIjfizgc6LYNwsbftvq801Cs++yPlCAlv9zGeV4lWhBR/TowU3suL6LVMLdfPYC8K8QbdGTypSUafPKGxGBahs7Bp7fbRWkwRW3xLCvTKjDDSUDyQ6Y0x" />
</div>

<table id="ContentPlaceHolder1_Table2" cellspacing="5" cellpadding="5" rules="rows" style="border-width:1px;border-style:Outset;height:136px;width:576px;z-index: 101; left: 92px; position: absolute; top: 1px">
<tr>
<td><span id="ContentPlaceHolder1_LabelMessage" style="display:inline-block;color:Black;border-color:#DDDDAA;border-width:1px;border-style:solid;font-size:12pt;height:126px;width:566px;"><blockquote> <p><p>A partial booking was done. <br>Room no.:LIB202A.<br>Requested date: Wednesday, August 31, 2016 <br>You need additional people for this room to be completely allocated to you. </p></p> </blockquote></span></td>
</tr>
</table>

<input type="submit" name="ctl00$ContentPlaceHolder1$Button1" value="Go to Main Booking Page" id="ContentPlaceHolder1_Button1" style="color:Black;background-color:#DDEEAA;font-size:10pt;width:168px;z-index: 100; left: 316px; position: absolute; top: 210px" />
</form>

<!---------------------------------------------------------------------------------------->
</div>
</section>
<section class="page_sidebar_wrapper">
<nav class="page_sidebar" style="left: auto; width: 187px;">
<ul class="page_sidebar_navigation" role="navigation" aria-label="Section navigation" style="height: 279px;">
<ul class="open">
<li role="menuitem" class="folderIndexLink current"><a class="selected" href="https://rooms.library.dc-uoit.ca/uoit_studyrooms/calendar.aspx" title="Group Study Rooms">Study Rooms</a></li>
<li role="menuitem"><a href="https://rooms.library.dc-uoit.ca/uoit_studyrooms/instruction.aspx" title="Instruction">Instruction</a></li>
<li role="menuitem"><a href="https://rooms.library.dc-uoit.ca/uoit_studyrooms/myreservations.aspx" title="My Bookings">My Bookings</a></li>
<li role="menuitem"><a href="https://rooms.library.dc-uoit.ca/uoit_studyrooms/room.aspx" title="Rooms" >Rooms</a></li>
</ul>
</ul>
</nav>
</section>
</div>
</section>

<!-----------END MAIN CONTENT ----------------------->

<footer class="footer">
<section class="footer_sec_top">
<div class="row">
<div class="footer_links">
<ul>
<li>
<div class="nav_col_title"><span>Help</span></div>
<ul>
<li><a href="http://uoit.ca/contact-us.php">Contact us</a></li>
<li><a href="http://uoit.ca/terms-of-use.php">Terms of use</a></li>
<li><a href="http://uoit.ca/forms/online/view.php?id=16035">Website feedback</a></li>
</ul>
</li>
<li>
<div class="nav_col_title"><span>Connect</span></div>
<ul>
<li><a href="https://hr.uoit.ca/working_at_uoit/careers/index.php">Career opportunities</a></li>
<li><a href="http://uoit.ca/expertcentre">Faculty experts</a></li>
<li><a href="http://news.uoit.ca/media-inquiries/index.php">Media inquiries</a></li>
</ul>
</li>
<li>
<div class="nav_col_title"><span>Visit</span></div>
<ul>
<li><a href="http://uoit.ca/about/campus-buildings/index.php">Campus buildings</a></li>
<li><a href="http://uoit.ca/maps">Campus map</a></li>
<li><a href="http://uoit.ca/main/future-students/undergraduate/campus-tours-and-events/index.php">Campus tours</a></li>
</ul>
</li>
<li>
<div class="nav_col_title"><span>Info</span></div>
<ul>
<li><a href="http://uoit.ca/about">About UOIT</a></li>
<li><a href="http://uoit.ca/about/governance">Governance</a></li>
</ul>
</li>
</ul>
</div>
</div>
</section>
<section class="footer_sec_bottom">
<div class="row">
<div class="logo_footer"><img alt="University of Ontario Institute of Technology logo" height="111" src="https://shared.uoit.ca/global/files/img/logos/UOIT_white.png" width="300"/></div>
<div class="footer_address">
<p><span>2000 Simcoe Street North</span> <span>Oshawa, Ontario L1H 7K4</span> <span>Canada</span></p>
<p><span>905.721.8668</span> © University of Ontario Institute of Technology
<script type="text/javascript">// <![CDATA[
document.write(new Date().getFullYear())
// ]]></script>
</p>
</div>
<div class="footer_social_icons">
<p>Challenge<span>Innovate</span>Connect</p>
<ul>
<li><a href="https://www.facebook.com/myuoit" onclick="ga('send','event','link','click','socialMediaPage_facbook');"><span>Facebook</span></a></li>
<li><a href="https://twitter.com/uoit" onclick="ga('send','event','link','click','socialMediaPage_twitter');"><span>Twitter</span></a></li>
<li><a href="http://www.linkedin.com/company/uoit" onclick="ga('send','event','link','click','socialMediaPage_linkedin');"><span>LinkedIn</span></a></li>
<li><a href="http://youtube.com/uoit" onclick="ga('send','event','link','click','socialMediaPage_youtube');"><span>YouTube</span></a></li>
</ul>
</div>
<div class="footer_backToTop"> <a href="/javascript:void(0)" title="Scroll to top of page"><span>Top</span></a> </div>
</div>
</section>
</footer>
<div id="primary_nav_section">
<div class="cd-overlay"></div>
</div>
</body>
</html>
Loading

0 comments on commit b91d033

Please sign in to comment.