Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

bundle js libs together

Browse Source
This commit is contained in:
Athou
2013-04-13 18:50:38 +02:00
parent 2cac91c5fa
commit 8fed8ea8a3
6 changed files with 133 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/commafeed/frontend/pages/BasePage.html Normal file
View File

@@ -0,0 +1,12 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org">
<head>
<title>CommaFeed</title>
<meta charset="utf-8">
<link rel="shortcut icon" type="image/x-icon" href="favicon.ico" />
</head>
<body>
<wicket:child />
<wicket:container wicket:id="footer-container"/>
</body>
</html>

7
src/main/java/com/commafeed/frontend/pages/BasePage.java
View File

@@ -3,6 +3,7 @@ package com.commafeed.frontend.pages;
import javax.inject.Inject;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.filter.HeaderResponseContainer;
import org.apache.wicket.markup.html.WebPage;
import com.commafeed.backend.dao.FeedCategoryDAO;
@@ -17,7 +18,7 @@ import com.commafeed.backend.dao.UserSettingsDAO;
import de.agilecoders.wicket.Bootstrap;
@SuppressWarnings("serial")
public class BasePage extends WebPage {
public abstract class BasePage extends WebPage {
@Inject
protected FeedDAO feedDAO;
@@ -43,6 +44,10 @@ public class BasePage extends WebPage {
@Inject
protected UserRoleDAO userRoleDAO;
public BasePage() {
add(new HeaderResponseContainer("footer-container", "footer-container"));
}
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);

15
src/main/java/com/commafeed/frontend/pages/HomePage.html
View File

@@ -1,15 +1,12 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org">
<head>
<title>CommaFeed</title>
<meta charset="utf-8">
<link rel="shortcut icon" type="image/x-icon" href="favicon.ico" />
</head>
<body>
<div ng-app="commafeed" id="main" class="main">
<div ui-view>
<wicket:extend>
<div ng-app="commafeed" id="main" class="main">
<div ui-view>
</div>
</div>
</div>
</wicket:extend>
</body>
</html>

1
src/main/java/com/commafeed/frontend/pages/HomePage.java
View File

@@ -39,6 +39,7 @@ public class HomePage extends BasePage {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
AngularReference.renderHead(response);
AngularResourceReference.renderHead(response);
AngularSanitizeReference.renderHead(response);

60
src/main/java/com/commafeed/frontend/pages/WelcomePage.html
View File

@@ -1,42 +1,38 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org">
<head>
<meta charset="utf-8">
<title>CommaFeed</title>
<link rel="shortcut icon" type="image/x-icon" href="favicon.ico" />
</head>
<body>
<div class="container">
<div class="row header">
<div class="text-center">
<h1>
<a wicket:id="logo-link">
<img src="images/logo.png"></img>
</a>
</h1>
<wicket:extend>
<div class="container">
<div class="row header">
<div class="text-center">
<h1>
<a wicket:id="logo-link">
<img src="images/logo.png"></img>
</a>
</h1>
</div>
CommaFeed is a bloat-free feed reader. It aims to replace Google Reader while keeping things simple.
</div>
CommaFeed is a bloat-free feed reader. It aims to replace Google Reader while keeping things simple.
</div>
<div class="row">
<div class="span6">
<div class="well" id="login-panel">
<h3>Login</h3>
<span wicket:id="login"></span>
<div class="row">
<div class="span6">
<div class="well" id="login-panel">
<h3>Login</h3>
<span wicket:id="login"></span>
</div>
</div>
<div class="span6" wicket:enclosure="register">
<div class="well" id="register-panel">
<h3>Register</h3>
<span wicket:id="register"></span>
</div>
</div>
</div>
<div class="span6" wicket:enclosure="register">
<div class="well" id="register-panel">
<h3>Register</h3>
<span wicket:id="register"></span>
</div>
<hr />
<div class="footer">
&copy; CommaFeed - 2013
</div>
</div>
<hr />
<div class="footer">
&copy; CommaFeed - 2013
</div>
</div>
</wicket:extend>
</body>
</html>