Merge pull request #378 from support-project/feature/issue375_return_…

…to_top Feature/issue375 return to top
support-project · May 20, 2016 · a1b8c4b · a1b8c4b
2 parents 1bf88ea + 04213c6
commit a1b8c4b
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 5 deletions.
diff --git a/src/main/webapp/WEB-INF/views/commons/layout/commonFooter.jsp b/src/main/webapp/WEB-INF/views/commons/layout/commonFooter.jsp
@@ -37,4 +37,4 @@
 		<!-- /copy -->
 	</div>
 	<!-- /footer -->
-	
+    <p class="pagetop" style="display: none;"><a href="#content_top"><i class="fa fa-arrow-up" aria-hidden="true"></i></a></p>
diff --git a/src/main/webapp/WEB-INF/views/commons/layout/commonScripts.jsp b/src/main/webapp/WEB-INF/views/commons/layout/commonScripts.jsp
@@ -27,6 +27,8 @@
 <script type="text/javascript" src="<%= request.getContextPath() %>/bower/notify.js/notify.js"></script>
 <script type="text/javascript" src="<%= request.getContextPath() %>/bower/jquery-oembed-all/jquery.oembed.js"></script>
 
+<script type="text/javascript" src="<%= jspUtil.mustReloadFile("/js/common.js") %>"></script>
+
 
 <script type="text/javascript">
 var _CONTEXT = '<%= request.getContextPath() %>';

diff --git a/src/main/webapp/WEB-INF/views/commons/layout/layoutMain.jsp b/src/main/webapp/WEB-INF/views/commons/layout/layoutMain.jsp
@@ -44,7 +44,7 @@
 </ol>
 --%>
 
-<div class="container">
+<div class="container" id="content_top">
 ${param.PARAM_CONTENT}
 </div>
 

diff --git a/src/main/webapp/WEB-INF/views/commons/layout/layoutNoMenu.jsp b/src/main/webapp/WEB-INF/views/commons/layout/layoutNoMenu.jsp
@@ -46,7 +46,7 @@
 		</div>
 	</div>
 
-<div class="container">
+<div class="container" id="content_top">
 ${param.PARAM_CONTENT}
 </div>
 

diff --git a/src/main/webapp/WEB-INF/views/commons/layout/layoutTop.jsp b/src/main/webapp/WEB-INF/views/commons/layout/layoutTop.jsp
@@ -32,8 +32,9 @@
 
 <body>
 
-
+<div id="content_top" style="margin: 0;padding: 0;">
 ${param.PARAM_CONTENT}
+</div>
 
 
 <c:import url="/WEB-INF/views/commons/layout/commonFooter.jsp" />

diff --git a/src/main/webapp/css/common.css b/src/main/webapp/css/common.css
@@ -132,4 +132,42 @@ body {
 
 .menu_list li {
 	margin-top: 10px;
-}
+}
+
+
+.pagetop {
+    display: none;
+    position: fixed;
+    bottom: 30px;
+    right: 30px;
+}
+.pagetop a {
+    border-radius: 30px;
+    width: 60px;
+    height: 60px;
+    display: block;
+    text-align: center;
+    vertical-align: middle;
+    background-color: #666699;
+    color: white;
+    font-size: 20px;
+    text-decoration: none;
+    padding:15px 10px;
+}
+
+.pagetop a:hover {
+    border-radius: 30px;
+    width: 60px;
+    height: 60px;
+    display: block;
+    text-align: center;
+    vertical-align: middle;
+    background-color: #333366;
+    color: #fff;
+    font-size: 20px;
+    text-decoration: none;
+    padding:15px 10px;
+}
+
+
+
diff --git a/src/main/webapp/js/common.js b/src/main/webapp/js/common.js
@@ -0,0 +1,17 @@
+$(document).ready(function() {
+    var pagetop = $('.pagetop');
+    $(window).scroll(function() {
+        if ($(this).scrollTop() > 100) {
+            pagetop.fadeIn();
+        } else {
+            pagetop.fadeOut();
+        }
+    });
+    pagetop.click(function() {
+        $('body, html').animate({
+            scrollTop : 0
+        }, 500);
+        return false;
+    });
+
+});
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,7 +44,7 @@ @@
     </ol>
     --%>
-    <div class="container">
+    <div class="container" id="content_top">
     ${param.PARAM_CONTENT}
     </div>
@@ Expand Down @@