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

use a cdn when possible

Browse Source
This commit is contained in:
Athou
2013-04-14 08:45:24 +02:00
parent 73c932ed6e
commit 8f7709b6c4
25 changed files with 140 additions and 3620 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,8 +14,7 @@ import com.commafeed.backend.dao.FeedSubscriptionDAO;
import com.commafeed.backend.dao.UserDAO;
import com.commafeed.backend.dao.UserRoleDAO;
import com.commafeed.backend.dao.UserSettingsDAO;
import de.agilecoders.wicket.Bootstrap;
import com.commafeed.frontend.references.bootstrap.BootstrapReference;
@SuppressWarnings("serial")
public abstract class BasePage extends WebPage {
@@ -51,6 +50,6 @@ public abstract class BasePage extends WebPage {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
Bootstrap.renderHead(response);
BootstrapReference.renderHead(response);
}
}

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

@@ -24,11 +24,8 @@ 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.select2.Select2Reference;
import com.commafeed.frontend.references.spinjs.SpinJSReference;
import de.agilecoders.wicket.markup.html.bootstrap.extensions.icon.OpenWebIconsCssReference;
@SuppressWarnings("serial")
@SecurityCheck(Role.USER)
public class HomePage extends BasePage {
@@ -48,15 +45,11 @@ public class HomePage extends BasePage {
AngularUIStateReference.renderHead(response);
NGUploadReference.renderHead(response);
NGInfiniteScrollReference.renderHead(response);
Select2Reference.renderHead(response);
SpinJSReference.renderHead(response);
MouseTrapReference.renderHead(response);
NGGridReference.renderHead(response);
CodeMirrorCssReference.renderHead(response);
response.render(CssHeaderItem.forReference(OpenWebIconsCssReference
.instance()));
response.render(JavaScriptHeaderItem.forUrl("js/main.js"));
response.render(JavaScriptHeaderItem.forUrl("js/controllers.js"));
response.render(JavaScriptHeaderItem.forUrl("js/directives.js"));

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

@@ -7,10 +7,9 @@ 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;
import de.agilecoders.wicket.Bootstrap;
@SuppressWarnings("serial")
public class BootstrapFeedbackPanel extends FeedbackPanel {
@@ -45,7 +44,7 @@ public class BootstrapFeedbackPanel extends FeedbackPanel {
get("feedbackul").add(new AttributeAppender("class", " unstyled"));
}
@Override
protected void onComponentTag(ComponentTag tag) {
tag.setName("div");
@@ -55,7 +54,7 @@ public class BootstrapFeedbackPanel extends FeedbackPanel {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
Bootstrap.renderHead(response);
BootstrapReference.renderHead(response);
WicketUtils.loadCSS(response, BootstrapFeedbackPanel.class);
}