Merge pull request #15 from svetlinas/master

Add images
slbedu · Jan 27, 2015 · ebabf25 · ebabf25
2 parents 04afb48 + 919809b
commit ebabf25
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/src/main/java/slbedu/library/dao/BookDAO.java b/src/main/java/slbedu/library/dao/BookDAO.java
@@ -18,7 +18,7 @@ public BookDAO(EntityManager em) {
     }
 
     public void addBook(Book book) {
-        EntityTransaction tx = beginTransaciton();
+        EntityTransaction tx = beginTransaction();
         Book foundBook = findByAuthorAndTitle(book.getAuthor(), book.getTitle());
         if (foundBook == null) {
             em.persist(book);
@@ -49,7 +49,7 @@ public Book findByAuthorAndTitle(String author, String title) {
     }
 
     public void borrowBook(Book bookToBorrow, User userWhoTakesTheBook) {
-        EntityTransaction tx = beginTransaciton();
+        EntityTransaction tx = beginTransaction();
         Book foundBook = findById(bookToBorrow.getId());
         int newAmount = foundBook.getAmount() - 1;
         foundBook.setAmount(newAmount);
@@ -58,7 +58,7 @@ public void borrowBook(Book bookToBorrow, User userWhoTakesTheBook) {
     }
 
     public void returnBook(Book book, User user) {
-        EntityTransaction tx = beginTransaciton();
+        EntityTransaction tx = beginTransaction();
         Book foundBook = findById(book.getId());
         int newAmount = book.getAmount() + 1;
         foundBook.setAmount(newAmount);
@@ -67,7 +67,7 @@ public void returnBook(Book book, User user) {
         commitTransaction(tx);
     }
 
-    private EntityTransaction beginTransaciton() {
+    private EntityTransaction beginTransaction() {
         EntityTransaction tx = em.getTransaction();
         tx.begin();
         return tx;

diff --git a/src/main/webapp/images/Research-Library_books.jpg b/src/main/webapp/images/Research-Library_books.jpg
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
@@ -11,9 +11,11 @@
     })
 </script>
 </head>
-<body>
+<body background="images/Research-Library_books.jpg">
+<div class="main">
 	<div>
 		<p class="content" />
 	</div>
+</div>
 </body>
 </html>
diff --git a/src/main/webapp/styles/bootstrap.css b/src/main/webapp/styles/bootstrap.css