Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master #2

Open
wants to merge 17 commits into
base: ronai
Choose a base branch
from
Open

Master #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e1357f4
Merge pull request #1 from openalm/ronai
openalmuser Aug 12, 2015
96983fd
Updated index.jsp
openalmuser Aug 12, 2015
a2b213d
Merge pull request #3 from openalm/ronai
openalmuser Aug 12, 2015
0095146
ronai: updated pricing
Aug 12, 2015
27c9f4c
Price refined
Aug 12, 2015
5418239
index.jsp
Aug 12, 2015
e656361
reverted sign-up
Aug 12, 2015
960f482
fixed a local link
Aug 12, 2015
2a2a6d3
Reverted fix
Aug 13, 2015
8337d35
Changes to links
Aug 13, 2015
3f04b54
Removed unnecessary deployment steps
openalmuser Aug 13, 2015
e96d1b9
New sign in link
Aug 13, 2015
1945a25
Fixed links
Aug 18, 2015
fb7c8ea
Added sign-in link
Aug 19, 2015
3e4b03b
Changes to links
Aug 19, 2015
524390f
Contact us link
Aug 19, 2015
74a1f36
ronai: added sign-in link
Aug 19, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion TheCoffeeShop3.0/Deploy/deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
sudo apt-get -y update

sudo apt-get -y install default-jre
sudo apt-get -y install tomcat7
sudo cp TheCoffeeShop.war /var/lib/tomcat7/webapps/
11 changes: 5 additions & 6 deletions TheCoffeeShop3.0/WebContent/index.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,13 @@
<div id="page">
<header>
<p class="site-title">
<a href="">Coffee Shop</a>
<a href="#">Coffee Shop</a>
</p>
<nav>
<ul>
<li><a href="index.jsp">Home</a></li>
<li><a href="about.jsp">About Us</a></li>
<li><a href="about.jsp">Shopping Cart</a></li>
<li><a href="index.jsp">Contact Us</a></li>
<li><a href="index.jsp">Contact us</a></li>
<li><a href="signin.jsp">Sign in</a></li>
</ul>
</nav> </header>
<div id="body">
Expand All @@ -36,7 +35,7 @@
<div id="featuredProductInfo">
<div id="productInfo">
<h2>Cappuccino</h2>
<p class="price">$3.75</p>
<p class="price">$3.45</p>
<p class="description">Cappuccino</p>
</div>
<div id="callToAction">
Expand Down Expand Up @@ -123,4 +122,4 @@

</body>

</html>
</html>