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

resources concat and minify in production

Browse Source
This commit is contained in:
Athou
2013-04-28 07:47:16 +02:00
parent fe3ccb92df
commit cfb1e550bc
66 changed files with 1413 additions and 14878 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,6 @@
<title>CommaFeed</title>
<meta charset="utf-8">
<link rel="shortcut icon" type="image/x-icon" href="favicon.ico" />
<!--[if IE]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
</head>
<body>
<wicket:child />

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

@@ -5,12 +5,12 @@ import java.util.Map;
import javax.inject.Inject;
import org.apache.commons.lang.StringUtils;
import org.apache.wicket.RuntimeConfigurationType;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.filter.HeaderResponseContainer;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.model.Model;
import org.apache.wicket.resource.TextTemplateResourceReference;
import com.commafeed.backend.dao.FeedCategoryDAO;
import com.commafeed.backend.dao.FeedDAO;
@@ -22,7 +22,7 @@ import com.commafeed.backend.dao.UserRoleDAO;
import com.commafeed.backend.dao.UserSettingsDAO;
import com.commafeed.backend.model.ApplicationSettings;
import com.commafeed.backend.services.ApplicationSettingsService;
import com.commafeed.frontend.references.bootstrap.BootstrapReference;
import com.commafeed.frontend.utils.WicketUtils;
import com.google.api.client.util.Maps;
@SuppressWarnings("serial")
@@ -62,16 +62,27 @@ public abstract class BasePage extends WebPage {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
BootstrapReference.renderHead(response);
if (getApplication().getConfigurationType() == RuntimeConfigurationType.DEPLOYMENT) {
response.render(JavaScriptHeaderItem.forUrl("wro/all.js"));
response.render(CssHeaderItem.forUrl("wro/all.css"));
} else {
response.render(JavaScriptHeaderItem.forUrl("wro/lib.js"));
response.render(CssHeaderItem.forUrl("wro/lib.css"));
response.render(JavaScriptHeaderItem.forUrl("js/welcome.js"));
response.render(JavaScriptHeaderItem.forUrl("js/main.js"));
response.render(JavaScriptHeaderItem.forUrl("js/controllers.js"));
response.render(JavaScriptHeaderItem.forUrl("js/directives.js"));
response.render(JavaScriptHeaderItem.forUrl("js/services.js"));
response.render(CssHeaderItem.forUrl("css/app.css"));
}
final ApplicationSettings settings = applicationSettingsService.get();
if (StringUtils.isNotBlank(settings.getGoogleAnalyticsTrackingCode())) {
Map<String, Object> vars = Maps.newHashMap();
vars.put("trackingCode", settings.getGoogleAnalyticsTrackingCode());
response.render(JavaScriptHeaderItem
.forReference(new TextTemplateResourceReference(
BasePage.class, "analytics.js", Model.ofMap(vars))));
WicketUtils.loadJS(response, BasePage.class, "analytics", vars);
}
}
}

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

@@ -2,26 +2,13 @@ package com.commafeed.frontend.pages;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.commafeed.backend.model.UserRole.Role;
import com.commafeed.backend.model.UserSettings;
import com.commafeed.frontend.CommaFeedSession;
import com.commafeed.frontend.SecurityCheck;
import com.commafeed.frontend.references.UserCustomCssReference;
import com.commafeed.frontend.references.angular.AngularReference;
import com.commafeed.frontend.references.angular.AngularResourceReference;
import com.commafeed.frontend.references.angular.AngularSanitizeReference;
import com.commafeed.frontend.references.angularui.AngularUIReference;
import com.commafeed.frontend.references.angularuibootstrap.AngularUIBootstrapReference;
import com.commafeed.frontend.references.angularuistate.AngularUIStateReference;
import com.commafeed.frontend.references.fontawesome.FontAwesomeReference;
import com.commafeed.frontend.references.mousetrap.MouseTrapReference;
import com.commafeed.frontend.references.nggrid.NGGridReference;
import com.commafeed.frontend.references.nginfinitescroll.NGInfiniteScrollReference;
import com.commafeed.frontend.references.ngupload.NGUploadReference;
import com.commafeed.frontend.references.spinjs.SpinJSReference;
import com.commafeed.frontend.resources.UserCustomCssReference;
@SuppressWarnings("serial")
@SecurityCheck(Role.USER)
@@ -31,26 +18,6 @@ public class HomePage extends BasePage {
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
AngularReference.renderHead(response);
AngularResourceReference.renderHead(response);
AngularSanitizeReference.renderHead(response);
AngularUIReference.renderHead(response);
AngularUIBootstrapReference.renderHead(response);
AngularUIStateReference.renderHead(response);
NGUploadReference.renderHead(response);
NGInfiniteScrollReference.renderHead(response);
SpinJSReference.renderHead(response);
MouseTrapReference.renderHead(response);
NGGridReference.renderHead(response);
FontAwesomeReference.renderHead(response);
response.render(JavaScriptHeaderItem.forUrl("js/main.js"));
response.render(JavaScriptHeaderItem.forUrl("js/controllers.js"));
response.render(JavaScriptHeaderItem.forUrl("js/directives.js"));
response.render(JavaScriptHeaderItem.forUrl("js/services.js"));
response.render(CssHeaderItem.forUrl("css/app.css"));
response.render(CssHeaderItem.forReference(
new UserCustomCssReference() {
@Override

3
src/main/java/com/commafeed/frontend/pages/WelcomePage.css
View File

@@ -1,3 +0,0 @@
.header {
margin: 20px 0 40px 0;
}

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

@@ -2,7 +2,7 @@
<html xmlns:wicket="http://wicket.apache.org">
<body>
<wicket:extend>
<div class="container">
<div class="container welcome">
<div class="row header">
<div class="text-center">
<h1>

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

@@ -2,13 +2,11 @@ package com.commafeed.frontend.pages;
import javax.inject.Inject;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import com.commafeed.backend.services.ApplicationSettingsService;
import com.commafeed.frontend.pages.components.LoginPanel;
import com.commafeed.frontend.pages.components.RegisterPanel;
import com.commafeed.frontend.utils.WicketUtils;
@SuppressWarnings("serial")
public class WelcomePage extends BasePage {
@@ -30,11 +28,4 @@ public class WelcomePage extends BasePage {
}
});
}
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
WicketUtils.loadJS(response, WelcomePage.class);
WicketUtils.loadCSS(response, WelcomePage.class);
}
}

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

@@ -1,7 +0,0 @@
$(function() {
var reg = $('#register-panel');
if (!reg) {
return;
}
$('#login-panel').height(reg.height());
});

3
src/main/java/com/commafeed/frontend/pages/components/BootstrapFeedbackPanel.css
View File

@@ -1,3 +0,0 @@
.bs-fb ul {
margin-bottom: 0px;
}

12
src/main/java/com/commafeed/frontend/pages/components/BootstrapFeedbackPanel.java
View File

@@ -3,13 +3,9 @@ package com.commafeed.frontend.pages.components;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.feedback.IFeedbackMessageFilter;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.model.AbstractReadOnlyModel;
import com.commafeed.frontend.references.bootstrap.BootstrapReference;
import com.commafeed.frontend.utils.WicketUtils;
@SuppressWarnings("serial")
public class BootstrapFeedbackPanel extends FeedbackPanel {
@@ -50,12 +46,4 @@ public class BootstrapFeedbackPanel extends FeedbackPanel {
tag.setName("div");
super.onComponentTag(tag);
}
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
BootstrapReference.renderHead(response);
WicketUtils.loadCSS(response, BootstrapFeedbackPanel.class);
}
}