Skip to content
This repository has been archived by the owner on Sep 9, 2020. It is now read-only.

Commit

Permalink
27: Generate Home view
Browse files Browse the repository at this point in the history
Task-Url: #27
  • Loading branch information
Xelit3 committed Dec 26, 2016
1 parent 13c39f5 commit 3460dad
Show file tree
Hide file tree
Showing 9 changed files with 59 additions and 70 deletions.
Original file line number Diff line number Diff line change
@@ -1,18 +1,36 @@
@CHARSET "ISO-8859-1";

html, body {
height: 100%;
}

header{
background: #2c3e50;
}

footer{
background: #16a085;
color: #fff;
color: #fff;
height: 3em;
}

h1{
color: #fff;
}

span{
visibility: hidden;
}

.main{
background: #f2f2f2;
}

.rsTrPendingGame:hover{
border-radius: 10px;
border: 2px double #4C9900;
}

input[type="number"]{
width: 5em;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
$(document).ready(function (){

});
31 changes: 0 additions & 31 deletions RocketStatsWeb/WebContent/views/Home.jsp

This file was deleted.

33 changes: 0 additions & 33 deletions RocketStatsWeb/WebContent/views/HomeUsersView.jsp

This file was deleted.

21 changes: 21 additions & 0 deletions RocketStatsWeb/WebContent/views/HomeView.jsp
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<%@include file="base/BaseHeaderView.jsp"%>

<body>
<header>
<div class="container-fluid">
<h1>Home</h1>
</div>

<%@include file="base/MenuHeader.jsp"%>
</header>

<p>
Inicio de la web de RocketStats
${userSession.getUserName()}
</p>

<%@include file="base/BaseFooterView.jsp"%>
<script type="text/javascript" src="resources/js/controller/HomeControllerScript.js"></script>
</body>

</html>
4 changes: 1 addition & 3 deletions RocketStatsWeb/WebContent/views/base/BaseFooterView.jsp
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
<div class="container-fluid">
<footer>GamersCreed - RocketStats Web - Xelit3 Design</footer>
</div>
<footer class="container-fluid">GamersCreed - RocketStats Web - Xelit3 Design</footer>
<!-- jQuery script links -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
<!-- Bootstrap script links -->
Expand Down
2 changes: 2 additions & 0 deletions RocketStatsWeb/WebContent/views/base/BaseHeaderView.jsp
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<%@ taglib prefix="sTag" uri="http://java.sun.com/jsp/jstl/core"%>

<!DOCTYPE html>
<html>

Expand Down
6 changes: 6 additions & 0 deletions RocketStatsWeb/WebContent/views/base/MenuHeader.jsp
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<ul class="nav nav-tabs">
<li class="active"><a href="#">Home</a></li>
<li><a href="#">Users</a></li>
<li><a href="#">Tournaments</a></li>
<li><a href="#">Steam</a></li>
</ul>
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,21 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.SessionAttributes;
import org.springframework.web.servlet.ModelAndView;

import gamerscreed.rocketstats.controller.base.BaseController;

@Controller
@SessionAttributes("userSession")
public class HomeController extends BaseController
{

@Override
@RequestMapping(value="/", method=RequestMethod.GET)
public ModelAndView viewIndex() {
// TODO Auto-generated method stub
//TODO : Slider imagenes de juegos del clan
return new ModelAndView("HomeView");
}
}

}

0 comments on commit 3460dad

Please sign in to comment.