Permalink
Browse files

none

  • Loading branch information...
1 parent 2b85942 commit c7d95fa9c5f3739e03385368373405e390c43804 @sunnykaka sunnykaka committed Jan 13, 2012
Showing with 744 additions and 58 deletions.
  1. +4 −0 src/main/java/com/mosso/deimos/user/web/LoginAction.java
  2. +2 −0 src/main/webapp/WEB-INF/decorators.xml
  3. +65 −0 src/main/webapp/WEB-INF/page/Copy of login.jsp
  4. +389 −57 src/main/webapp/WEB-INF/page/login.jsp
  5. +27 −0 src/main/webapp/WEB-INF/page/register.jsp
  6. +1 −1 src/main/webapp/WEB-INF/web.xml
  7. +224 −0 src/main/webapp/css/jquery.fancybox.css
  8. BIN src/main/webapp/{js/fancybox → images}/blank.gif
  9. BIN src/main/webapp/images/fancybox_loading.gif
  10. BIN src/main/webapp/images/fancybox_sprite.png
  11. BIN src/main/webapp/images/login-sprite.png
  12. BIN src/main/webapp/js/backup/fancybox/blank.gif
  13. BIN src/main/webapp/js/{ → backup}/fancybox/fancy_close.png
  14. BIN src/main/webapp/js/{ → backup}/fancybox/fancy_loading.png
  15. BIN src/main/webapp/js/{ → backup}/fancybox/fancy_nav_left.png
  16. BIN src/main/webapp/js/{ → backup}/fancybox/fancy_nav_right.png
  17. BIN src/main/webapp/js/{ → backup}/fancybox/fancy_shadow_e.png
  18. BIN src/main/webapp/js/{ → backup}/fancybox/fancy_shadow_n.png
  19. BIN src/main/webapp/js/{ → backup}/fancybox/fancy_shadow_ne.png
  20. BIN src/main/webapp/js/{ → backup}/fancybox/fancy_shadow_nw.png
  21. BIN src/main/webapp/js/{ → backup}/fancybox/fancy_shadow_s.png
  22. BIN src/main/webapp/js/{ → backup}/fancybox/fancy_shadow_se.png
  23. BIN src/main/webapp/js/{ → backup}/fancybox/fancy_shadow_sw.png
  24. BIN src/main/webapp/js/{ → backup}/fancybox/fancy_shadow_w.png
  25. BIN src/main/webapp/js/{ → backup}/fancybox/fancy_title_left.png
  26. BIN src/main/webapp/js/{ → backup}/fancybox/fancy_title_main.png
  27. BIN src/main/webapp/js/{ → backup}/fancybox/fancy_title_over.png
  28. BIN src/main/webapp/js/{ → backup}/fancybox/fancy_title_right.png
  29. BIN src/main/webapp/js/{ → backup}/fancybox/fancybox-x.png
  30. BIN src/main/webapp/js/{ → backup}/fancybox/fancybox-y.png
  31. BIN src/main/webapp/js/{ → backup}/fancybox/fancybox.png
  32. 0 src/main/webapp/js/{ → backup}/fancybox/jquery.fancybox-1.3.4.css
  33. 0 src/main/webapp/js/{ → backup}/fancybox/jquery.fancybox-1.3.4.pack.js
  34. 0 src/main/webapp/js/{ → backup}/jquery-1.4.3.min.js
  35. BIN src/main/webapp/js/{ → backup}/slide/arrows.png
  36. BIN src/main/webapp/js/{ → backup}/slide/bullets.png
  37. 0 src/main/webapp/js/{ → backup}/slide/default.css
  38. 0 src/main/webapp/js/{ → backup}/slide/jquery.nivo.slider.pack.js
  39. BIN src/main/webapp/js/{ → backup}/slide/loading.gif
  40. 0 src/main/webapp/js/{ → backup}/slide/nivo-slider.css
  41. +32 −0 src/main/webapp/js/jquery.fancybox.pack.js
@@ -12,4 +12,8 @@ public String loginPage() {
return "/login";
}
+ @RequestMapping(value="/register", method=RequestMethod.GET)
+ public String registerPage() {
+ return "/register";
+ }
}
@@ -7,6 +7,8 @@
</decorator>
<excludes>
<pattern>/ajax/*</pattern>
+ <pattern>/login.action</pattern>
+ <pattern>/register.action</pattern>
</excludes>
</decorators>
@@ -0,0 +1,65 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+ pageEncoding="UTF-8"%>
+<%@ include file="/WEB-INF/page/inc/taglibs.jsp"%>
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+</head>
+
+<body>
+ <div style="padding-top:40px;" class="slider-wrapper theme-default">
+ <div id="slider" class="nivoSlider">
+ <img src="images/slide1.png" title="this is a caption!" alt="slider image 1"/>
+ <img src="images/slide2.png" alt="slider image 2"/>
+ </div>
+ </div>
+
+ <div class="box">
+ <h1>Looking for an Awesome Title? Hmmmm Awesome Title...</h1>
+ </div>
+
+ <div class="one_fourth"><!--start top half content-->
+ <h3>Secondary awesome title required also!</h3>
+ <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce vestibulum massa eu nisi lacinia quis. <a href="#">link</a></p>
+ </div>
+ <div class="one_fourth">
+ <div class="fancy"><a id="fancybox" href="images/210-150-1.png"><img alt="fancybox" src="images/210-150-1.png" /></a></div>
+ </div>
+ <div class="one_fourth">
+ <div class="fancy"><a id="fancybox" href="images/210-150-2.png"><img alt="fancybox" src="images/210-150-2.png" /></a></div>
+ </div>
+ <div class="one_fourth column-last">
+ <div class="fancy"><a id="fancybox" href="images/210-150-3.png"><img alt="fancybox" src="images/210-150-3.png" /></a></div>
+ </div><!--end top half content-->
+
+ <div class="clear"></div>
+
+ <div class="one_fourth">
+ <h3>One</h3>
+ <p>Donec metus leo, elementum at ultrices ac, dapibus at justo. Donec tristique hendrerit dui vitae lacinia. Suspendisse ante ligula, adipiscing porta aliquam et, rutrum nec lectus. Nulla erat risus, molestie non dapibus ac, fermentum vitae felis.</p>
+ </div>
+ <div class="one_fourth">
+ <h3>Two</h3>
+ <p>Donec metus leo, elementum at ultrices ac, dapibus at justo. Donec tristique hendrerit dui vitae lacinia. Suspendisse ante ligula, adipiscing porta aliquam et, rutrum nec lectus. Nulla erat risus, molestie non dapibus ac, fermentum vitae felis.</p>
+ </div>
+ <div class="one_fourth">
+ <h3>Three</h3>
+ <p>Donec metus leo, elementum at ultrices ac, dapibus at justo. Donec tristique hendrerit dui vitae lacinia. Suspendisse ante ligula, adipiscing porta aliquam et, rutrum nec lectus. Nulla erat risus, molestie non dapibus ac, fermentum vitae felis.</p>
+ </div>
+ <div class="one_fourth column-last">
+ <h3>Four</h3>
+ <p>Donec metus leo, elementum at ultrices ac, dapibus at justo. Donec tristique hendrerit dui vitae lacinia. Suspendisse ante ligula, adipiscing porta aliquam et, rutrum nec lectus. Nulla erat risus, molestie non dapibus ac, fermentum vitae felis.</p>
+ </div>
+
+
+ <!--Nivo Slider-->
+ <script type="text/javascript" src="${ctxPath}/js/slide/jquery.nivo.slider.pack.js"></script>
+ <script type="text/javascript">
+ $(window).load(function() {
+ $('#slider').nivoSlider();
+ });
+ </script>
+ <!--Nivo Slider-->
+
+</body>
+</html>
Oops, something went wrong.

0 comments on commit c7d95fa

Please sign in to comment.