The Unified and Autonomous Development Platform
Refactor sidebar
robin shen457ac3f49075
diff --git a/product/src/main/java/com/turbodev/server/product/ProductServletConfigurator.java b/product/src/main/java/com/turbodev/server/product/ProductServletConfigurator.javaindex f64cb03848..218df2b4c7 100644--- a/product/src/main/java/com/turbodev/server/product/ProductServletConfigurator.java+++ b/product/src/main/java/com/turbodev/server/product/ProductServletConfigurator.java@@ -25,8 +25,8 @@ import com.turbodev.server.util.jetty.ClasspathAssetServlet;import com.turbodev.server.util.jetty.FileAssetServlet;import com.turbodev.server.util.jetty.ServletConfigurator;import com.turbodev.server.util.serverconfig.ServerConfig;-import com.turbodev.server.web.assets.Assets;import com.turbodev.server.web.component.markdown.AttachmentUploadServlet;+import com.turbodev.server.web.img.Img;import com.turbodev.server.web.websocket.WebSocketManager;public class ProductServletConfigurator implements ServletConfigurator {@@ -91,9 +91,8 @@ public class ProductServletConfigurator implements ServletConfigurator {context.addServlet(AttachmentUploadServlet.class, "/attachment_upload");- ServletHolder assetServletHolder = new ServletHolder(new ClasspathAssetServlet(Assets.class));- context.addServlet(assetServletHolder, "/assets/*");- context.addServlet(assetServletHolder, "/favicon.ico");+ ServletHolder imgServletHolder = new ServletHolder(new ClasspathAssetServlet(Img.class));+ context.addServlet(imgServletHolder, "/img/*");context.getSessionHandler().addEventListener(new HttpSessionListener() {diff --git a/web/src/main/java/com/turbodev/server/web/TurboDevWebApplication.java b/web/src/main/java/com/turbodev/server/web/TurboDevWebApplication.javaindex 21c8afd68f..7fef737f20 100644--- a/web/src/main/java/com/turbodev/server/web/TurboDevWebApplication.java+++ b/web/src/main/java/com/turbodev/server/web/TurboDevWebApplication.java@@ -27,6 +27,7 @@ import org.apache.wicket.core.request.handler.PageProvider;import org.apache.wicket.core.request.handler.RenderPageRequestHandler;import org.apache.wicket.core.request.mapper.HomePageMapper;import org.apache.wicket.markup.html.pages.AbstractErrorPage;+import org.apache.wicket.markup.html.pages.BrowserInfoPage;import org.apache.wicket.protocol.http.WebApplication;import org.apache.wicket.protocol.http.servlet.ServletWebRequest;import org.apache.wicket.protocol.ws.WebSocketSettings;@@ -83,6 +84,8 @@ public class TurboDevWebApplication extends WebApplication {getStoreSettings().setFileStoreFolder(Bootstrap.getTempDir());+ getRequestCycleSettings().setGatherExtendedBrowserInfo(true);+BootstrapSettings bootstrapSettings = new BootstrapSettings();bootstrapSettings.setAutoAppendResources(false);de.agilecoders.wicket.core.Bootstrap.install(this, bootstrapSettings);@@ -93,8 +96,9 @@ public class TurboDevWebApplication extends WebApplication {public void onInstantiation(Component component) {if ((component instanceof Page)&& !(component instanceof AbstractErrorPage)- && !(component instanceof BasePage)) {- throw new RuntimeException("All page classes should extend from BasePage.");+ && !(component instanceof BasePage)+ && !(component instanceof BrowserInfoPage)) {+ throw new RuntimeException("Page classes should extend from BasePage.");}}});diff --git a/web/src/main/java/com/turbodev/server/web/WebConstants.java b/web/src/main/java/com/turbodev/server/web/WebConstants.javaindex 6f43aa29fa..54ae4230a9 100644--- a/web/src/main/java/com/turbodev/server/web/WebConstants.java+++ b/web/src/main/java/com/turbodev/server/web/WebConstants.java@@ -22,5 +22,4 @@ public class WebConstants {/* commit constants */public static final int MAX_DISPLAY_COMMITS = 500;-}diff --git a/web/src/main/java/com/turbodev/server/web/assets/js/align/AlignResourceReference.java b/web/src/main/java/com/turbodev/server/web/asset/align/AlignResourceReference.javasimilarity index 85%rename from web/src/main/java/com/turbodev/server/web/assets/js/align/AlignResourceReference.javarename to web/src/main/java/com/turbodev/server/web/asset/align/AlignResourceReference.javaindex 33285c1ce7..1c06d4d19c 100644--- a/web/src/main/java/com/turbodev/server/web/assets/js/align/AlignResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/asset/align/AlignResourceReference.java@@ -1,4 +1,4 @@-package com.turbodev.server.web.assets.js.align;+package com.turbodev.server.web.asset.align;import java.util.ArrayList;import java.util.List;@@ -8,7 +8,7 @@ import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.request.resource.JavaScriptResourceReference;-import com.turbodev.server.web.assets.js.textareacaretposition.TextareaCaretPositionResourceReference;+import com.turbodev.server.web.asset.textareacaretposition.TextareaCaretPositionResourceReference;public class AlignResourceReference extends JavaScriptResourceReference {diff --git a/web/src/main/java/com/turbodev/server/web/assets/js/align/jquery.align.js b/web/src/main/java/com/turbodev/server/web/asset/align/jquery.align.jssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/js/align/jquery.align.jsrename to web/src/main/java/com/turbodev/server/web/asset/align/jquery.align.jsdiff --git a/web/src/main/java/com/turbodev/server/web/assets/js/areyousure/AreYouSureResourceReference.java b/web/src/main/java/com/turbodev/server/web/asset/areyousure/AreYouSureResourceReference.javasimilarity index 93%rename from web/src/main/java/com/turbodev/server/web/assets/js/areyousure/AreYouSureResourceReference.javarename to web/src/main/java/com/turbodev/server/web/asset/areyousure/AreYouSureResourceReference.javaindex 4294b38708..d2c033d122 100644--- a/web/src/main/java/com/turbodev/server/web/assets/js/areyousure/AreYouSureResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/asset/areyousure/AreYouSureResourceReference.java@@ -1,4 +1,4 @@-package com.turbodev.server.web.assets.js.areyousure;+package com.turbodev.server.web.asset.areyousure;import java.util.ArrayList;import java.util.List;diff --git a/web/src/main/java/com/turbodev/server/web/assets/js/areyousure/jquery.are-you-sure.patched.js b/web/src/main/java/com/turbodev/server/web/asset/areyousure/jquery.are-you-sure.patched.jssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/js/areyousure/jquery.are-you-sure.patched.jsrename to web/src/main/java/com/turbodev/server/web/asset/areyousure/jquery.are-you-sure.patched.jsdiff --git a/web/src/main/java/com/turbodev/server/web/assets/js/atwho/AtWhoResourceReference.java b/web/src/main/java/com/turbodev/server/web/asset/atwho/AtWhoResourceReference.javasimilarity index 95%rename from web/src/main/java/com/turbodev/server/web/assets/js/atwho/AtWhoResourceReference.javarename to web/src/main/java/com/turbodev/server/web/asset/atwho/AtWhoResourceReference.javaindex 297226af1f..9a43585ad0 100644--- a/web/src/main/java/com/turbodev/server/web/assets/js/atwho/AtWhoResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/asset/atwho/AtWhoResourceReference.java@@ -1,4 +1,4 @@-package com.turbodev.server.web.assets.js.atwho;+package com.turbodev.server.web.asset.atwho;import java.util.ArrayList;import java.util.List;diff --git a/web/src/main/java/com/turbodev/server/web/assets/js/atwho/jquery.atwho-caret.js b/web/src/main/java/com/turbodev/server/web/asset/atwho/jquery.atwho-caret.jssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/js/atwho/jquery.atwho-caret.jsrename to web/src/main/java/com/turbodev/server/web/asset/atwho/jquery.atwho-caret.jsdiff --git a/web/src/main/java/com/turbodev/server/web/assets/js/atwho/jquery.atwho.css b/web/src/main/java/com/turbodev/server/web/asset/atwho/jquery.atwho.csssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/js/atwho/jquery.atwho.cssrename to web/src/main/java/com/turbodev/server/web/asset/atwho/jquery.atwho.cssdiff --git a/web/src/main/java/com/turbodev/server/web/assets/js/atwho/jquery.atwho.js b/web/src/main/java/com/turbodev/server/web/asset/atwho/jquery.atwho.jssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/js/atwho/jquery.atwho.jsrename to web/src/main/java/com/turbodev/server/web/asset/atwho/jquery.atwho.jsdiff --git a/web/src/main/java/com/turbodev/server/web/assets/js/autosize/AutoSizeResourceReference.java b/web/src/main/java/com/turbodev/server/web/asset/autosize/AutoSizeResourceReference.javasimilarity index 93%rename from web/src/main/java/com/turbodev/server/web/assets/js/autosize/AutoSizeResourceReference.javarename to web/src/main/java/com/turbodev/server/web/asset/autosize/AutoSizeResourceReference.javaindex 300f38c035..fe82ebd147 100644--- a/web/src/main/java/com/turbodev/server/web/assets/js/autosize/AutoSizeResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/asset/autosize/AutoSizeResourceReference.java@@ -1,4 +1,4 @@-package com.turbodev.server.web.assets.js.autosize;+package com.turbodev.server.web.asset.autosize;import java.util.ArrayList;import java.util.List;diff --git a/web/src/main/java/com/turbodev/server/web/assets/js/autosize/autosize.js b/web/src/main/java/com/turbodev/server/web/asset/autosize/autosize.jssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/js/autosize/autosize.jsrename to web/src/main/java/com/turbodev/server/web/asset/autosize/autosize.jsdiff --git a/web/src/main/java/com/turbodev/server/web/assets/js/caret/CaretResourceReference.java b/web/src/main/java/com/turbodev/server/web/asset/caret/CaretResourceReference.javasimilarity index 93%rename from web/src/main/java/com/turbodev/server/web/assets/js/caret/CaretResourceReference.javarename to web/src/main/java/com/turbodev/server/web/asset/caret/CaretResourceReference.javaindex f38a9324de..27c44d8bfb 100644--- a/web/src/main/java/com/turbodev/server/web/assets/js/caret/CaretResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/asset/caret/CaretResourceReference.java@@ -1,4 +1,4 @@-package com.turbodev.server.web.assets.js.caret;+package com.turbodev.server.web.asset.caret;import java.util.ArrayList;import java.util.List;diff --git a/web/src/main/java/com/turbodev/server/web/assets/js/caret/jquery.caret-1.5.2.js b/web/src/main/java/com/turbodev/server/web/asset/caret/jquery.caret-1.5.2.jssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/js/caret/jquery.caret-1.5.2.jsrename to web/src/main/java/com/turbodev/server/web/asset/caret/jquery.caret-1.5.2.jsdiff --git a/web/src/main/java/com/turbodev/server/web/assets/js/chart/ChartResourceReference.java b/web/src/main/java/com/turbodev/server/web/asset/chart/ChartResourceReference.javasimilarity index 93%rename from web/src/main/java/com/turbodev/server/web/assets/js/chart/ChartResourceReference.javarename to web/src/main/java/com/turbodev/server/web/asset/chart/ChartResourceReference.javaindex 005bfec340..183a83e413 100644--- a/web/src/main/java/com/turbodev/server/web/assets/js/chart/ChartResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/asset/chart/ChartResourceReference.java@@ -1,4 +1,4 @@-package com.turbodev.server.web.assets.js.chart;+package com.turbodev.server.web.asset.chart;import java.util.ArrayList;import java.util.List;diff --git a/web/src/main/java/com/turbodev/server/web/assets/js/chart/chart.bundle.min.js b/web/src/main/java/com/turbodev/server/web/asset/chart/chart.bundle.min.jssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/js/chart/chart.bundle.min.jsrename to web/src/main/java/com/turbodev/server/web/asset/chart/chart.bundle.min.jsdiff --git a/web/src/main/java/com/turbodev/server/web/assets/js/clipboard/ClipboardResourceReference.java b/web/src/main/java/com/turbodev/server/web/asset/clipboard/ClipboardResourceReference.javasimilarity index 85%rename from web/src/main/java/com/turbodev/server/web/assets/js/clipboard/ClipboardResourceReference.javarename to web/src/main/java/com/turbodev/server/web/asset/clipboard/ClipboardResourceReference.javaindex ff5508285a..1ba2eed84b 100644--- a/web/src/main/java/com/turbodev/server/web/assets/js/clipboard/ClipboardResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/asset/clipboard/ClipboardResourceReference.java@@ -1,4 +1,4 @@-package com.turbodev.server.web.assets.js.clipboard;+package com.turbodev.server.web.asset.clipboard;import org.apache.wicket.request.resource.JavaScriptResourceReference;diff --git a/web/src/main/java/com/turbodev/server/web/assets/js/clipboard/clipboard.min.js b/web/src/main/java/com/turbodev/server/web/asset/clipboard/clipboard.min.jssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/js/clipboard/clipboard.min.jsrename to web/src/main/java/com/turbodev/server/web/asset/clipboard/clipboard.min.jsdiff --git a/web/src/main/java/com/turbodev/server/web/assets/js/codemirror/CodeMirrorResourceReference.java b/web/src/main/java/com/turbodev/server/web/asset/codemirror/CodeMirrorResourceReference.javasimilarity index 97%rename from web/src/main/java/com/turbodev/server/web/assets/js/codemirror/CodeMirrorResourceReference.javarename to web/src/main/java/com/turbodev/server/web/asset/codemirror/CodeMirrorResourceReference.javaindex 61c0adb130..958d6c0013 100644--- a/web/src/main/java/com/turbodev/server/web/assets/js/codemirror/CodeMirrorResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/asset/codemirror/CodeMirrorResourceReference.java@@ -1,4 +1,4 @@-package com.turbodev.server.web.assets.js.codemirror;+package com.turbodev.server.web.asset.codemirror;import java.util.List;@@ -6,7 +6,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import com.turbodev.server.web.assets.js.hotkeys.HotkeysResourceReference;+import com.turbodev.server.web.asset.hotkeys.HotkeysResourceReference;import com.turbodev.server.web.page.base.BaseDependentCssResourceReference;import com.turbodev.server.web.page.base.BaseDependentResourceReference;import com.turbodev.server.web.util.resourcebundle.ResourceBundle;diff --git a/web/src/main/java/com/turbodev/server/web/assets/js/codemirror/ModeUrlResourceReference.java b/web/src/main/java/com/turbodev/server/web/asset/codemirror/ModeUrlResourceReference.javasimilarity index 96%rename from web/src/main/java/com/turbodev/server/web/assets/js/codemirror/ModeUrlResourceReference.javarename to web/src/main/java/com/turbodev/server/web/asset/codemirror/ModeUrlResourceReference.javaindex 52542a6ab3..4464f3963d 100644--- a/web/src/main/java/com/turbodev/server/web/assets/js/codemirror/ModeUrlResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/asset/codemirror/ModeUrlResourceReference.java@@ -1,4 +1,4 @@-package com.turbodev.server.web.assets.js.codemirror;+package com.turbodev.server.web.asset.codemirror;import java.util.List;diff --git a/web/src/main/java/com/turbodev/server/web/assets/js/codemirror/annotatescrollbar2.js b/web/src/main/java/com/turbodev/server/web/asset/codemirror/annotatescrollbar2.jssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/js/codemirror/annotatescrollbar2.jsrename to web/src/main/java/com/turbodev/server/web/asset/codemirror/annotatescrollbar2.jsdiff --git a/web/src/main/java/com/turbodev/server/web/assets/js/codemirror/blank.js b/web/src/main/java/com/turbodev/server/web/asset/codemirror/blank.jssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/js/codemirror/blank.jsrename to web/src/main/java/com/turbodev/server/web/asset/codemirror/blank.jsdiff --git a/web/src/main/java/com/turbodev/server/web/assets/js/codemirror/codemirror.css b/web/src/main/java/com/turbodev/server/web/asset/codemirror/codemirror.csssimilarity index 91%rename from web/src/main/java/com/turbodev/server/web/assets/js/codemirror/codemirror.cssrename to web/src/main/java/com/turbodev/server/web/asset/codemirror/codemirror.cssindex 648d4750c3..c489ae574e 100644--- a/web/src/main/java/com/turbodev/server/web/assets/js/codemirror/codemirror.css+++ b/web/src/main/java/com/turbodev/server/web/asset/codemirror/codemirror.css@@ -5,11 +5,13 @@background: #CCCCFF;}.CodeMirror {- font-size: 13px;+ font-size: 12px;+ line-height: 1.5;font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;}.CodeMirror-gutters {background: white;+ border-right-color: #E0E0E0;}.CodeMirror-selected {background-color: #3399FF !important;@@ -50,3 +52,6 @@box-sizing: border-box;opacity: .5;}+.CodeMirror-fullscreen {+ z-index: 210;+}\ No newline at end of filediff --git a/web/src/main/java/com/turbodev/server/web/assets/js/codemirror/codemirror.js b/web/src/main/java/com/turbodev/server/web/asset/codemirror/codemirror.jssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/js/codemirror/codemirror.jsrename to web/src/main/java/com/turbodev/server/web/asset/codemirror/codemirror.jsdiff --git a/web/src/main/java/com/turbodev/server/web/assets/js/codemirror/gotoline.js b/web/src/main/java/com/turbodev/server/web/asset/codemirror/gotoline.jssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/js/codemirror/gotoline.jsrename to web/src/main/java/com/turbodev/server/web/asset/codemirror/gotoline.jsdiff --git a/web/src/main/java/com/turbodev/server/web/assets/js/codemirror/highlight.css b/web/src/main/java/com/turbodev/server/web/asset/codemirror/highlight.csssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/js/codemirror/highlight.cssrename to web/src/main/java/com/turbodev/server/web/asset/codemirror/highlight.cssdiff --git a/web/src/main/java/com/turbodev/server/web/assets/js/codemirror/highlight.js b/web/src/main/java/com/turbodev/server/web/asset/codemirror/highlight.jssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/js/codemirror/highlight.jsrename to web/src/main/java/com/turbodev/server/web/asset/codemirror/highlight.jsdiff --git a/web/src/main/java/com/turbodev/server/web/assets/js/codemirror/identifier-highlighter.js b/web/src/main/java/com/turbodev/server/web/asset/codemirror/identifier-highlighter.jssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/js/codemirror/identifier-highlighter.jsrename to web/src/main/java/com/turbodev/server/web/asset/codemirror/identifier-highlighter.jsdiff --git a/web/src/main/java/com/turbodev/server/web/assets/js/codemirror/matchesonscrollbar2.js b/web/src/main/java/com/turbodev/server/web/asset/codemirror/matchesonscrollbar2.jssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/js/codemirror/matchesonscrollbar2.jsrename to web/src/main/java/com/turbodev/server/web/asset/codemirror/matchesonscrollbar2.jsdiff --git a/web/src/main/java/com/turbodev/server/web/assets/js/codemirror/simplescrollbars.js b/web/src/main/java/com/turbodev/server/web/asset/codemirror/simplescrollbars.jssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/js/codemirror/simplescrollbars.jsrename to web/src/main/java/com/turbodev/server/web/asset/codemirror/simplescrollbars.jsdiff --git a/web/src/main/java/com/turbodev/server/web/assets/js/cookies/CookiesResourceReference.java b/web/src/main/java/com/turbodev/server/web/asset/cookies/CookiesResourceReference.javasimilarity index 85%rename from web/src/main/java/com/turbodev/server/web/assets/js/cookies/CookiesResourceReference.javarename to web/src/main/java/com/turbodev/server/web/asset/cookies/CookiesResourceReference.javaindex d44ab67592..261799600b 100644--- a/web/src/main/java/com/turbodev/server/web/assets/js/cookies/CookiesResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/asset/cookies/CookiesResourceReference.java@@ -1,4 +1,4 @@-package com.turbodev.server.web.assets.js.cookies;+package com.turbodev.server.web.asset.cookies;import org.apache.wicket.request.resource.JavaScriptResourceReference;diff --git a/web/src/main/java/com/turbodev/server/web/assets/js/cookies/cookies.min.js b/web/src/main/java/com/turbodev/server/web/asset/cookies/cookies.min.jssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/js/cookies/cookies.min.jsrename to web/src/main/java/com/turbodev/server/web/asset/cookies/cookies.min.jsdiff --git a/web/src/main/java/com/turbodev/server/web/assets/js/diffmatchpatch/DiffMatchPatchResourceReference.java b/web/src/main/java/com/turbodev/server/web/asset/diffmatchpatch/DiffMatchPatchResourceReference.javasimilarity index 85%rename from web/src/main/java/com/turbodev/server/web/assets/js/diffmatchpatch/DiffMatchPatchResourceReference.javarename to web/src/main/java/com/turbodev/server/web/asset/diffmatchpatch/DiffMatchPatchResourceReference.javaindex 305f10e176..bd508f25e2 100644--- a/web/src/main/java/com/turbodev/server/web/assets/js/diffmatchpatch/DiffMatchPatchResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/asset/diffmatchpatch/DiffMatchPatchResourceReference.java@@ -1,4 +1,4 @@-package com.turbodev.server.web.assets.js.diffmatchpatch;+package com.turbodev.server.web.asset.diffmatchpatch;import org.apache.wicket.request.resource.JavaScriptResourceReference;diff --git a/web/src/main/java/com/turbodev/server/web/assets/js/diffmatchpatch/diff_match_patch.js b/web/src/main/java/com/turbodev/server/web/asset/diffmatchpatch/diff_match_patch.jssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/js/diffmatchpatch/diff_match_patch.jsrename to web/src/main/java/com/turbodev/server/web/asset/diffmatchpatch/diff_match_patch.jsdiff --git a/web/src/main/java/com/turbodev/server/web/assets/js/doneevents/DoneEventsResourceReference.java b/web/src/main/java/com/turbodev/server/web/asset/doneevents/DoneEventsResourceReference.javasimilarity index 93%rename from web/src/main/java/com/turbodev/server/web/assets/js/doneevents/DoneEventsResourceReference.javarename to web/src/main/java/com/turbodev/server/web/asset/doneevents/DoneEventsResourceReference.javaindex 57cff50ebb..36eca834c6 100644--- a/web/src/main/java/com/turbodev/server/web/assets/js/doneevents/DoneEventsResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/asset/doneevents/DoneEventsResourceReference.java@@ -1,4 +1,4 @@-package com.turbodev.server.web.assets.js.doneevents;+package com.turbodev.server.web.asset.doneevents;import java.util.ArrayList;import java.util.List;diff --git a/web/src/main/java/com/turbodev/server/web/assets/js/doneevents/jquery.doneevents.js b/web/src/main/java/com/turbodev/server/web/asset/doneevents/jquery.doneevents.jssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/js/doneevents/jquery.doneevents.jsrename to web/src/main/java/com/turbodev/server/web/asset/doneevents/jquery.doneevents.jsdiff --git a/web/src/main/java/com/turbodev/server/web/assets/js/dropzone/DropzoneResourceReference.java b/web/src/main/java/com/turbodev/server/web/asset/dropzone/DropzoneResourceReference.javasimilarity index 95%rename from web/src/main/java/com/turbodev/server/web/assets/js/dropzone/DropzoneResourceReference.javarename to web/src/main/java/com/turbodev/server/web/asset/dropzone/DropzoneResourceReference.javaindex b24944e554..6d771f42cb 100644--- a/web/src/main/java/com/turbodev/server/web/assets/js/dropzone/DropzoneResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/asset/dropzone/DropzoneResourceReference.java@@ -1,4 +1,4 @@-package com.turbodev.server.web.assets.js.dropzone;+package com.turbodev.server.web.asset.dropzone;import java.util.ArrayList;import java.util.List;diff --git a/web/src/main/java/com/turbodev/server/web/assets/js/dropzone/dropzone.css b/web/src/main/java/com/turbodev/server/web/asset/dropzone/dropzone.csssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/js/dropzone/dropzone.cssrename to web/src/main/java/com/turbodev/server/web/asset/dropzone/dropzone.cssdiff --git a/web/src/main/java/com/turbodev/server/web/assets/js/dropzone/dropzone.js b/web/src/main/java/com/turbodev/server/web/asset/dropzone/dropzone.jssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/js/dropzone/dropzone.jsrename to web/src/main/java/com/turbodev/server/web/asset/dropzone/dropzone.jsdiff --git a/web/src/main/java/com/turbodev/server/web/asset/fontext/FontExtResourceReference.java b/web/src/main/java/com/turbodev/server/web/asset/fontext/FontExtResourceReference.javanew file mode 100644index 0000000000..1c7fbdd2c6--- /dev/null+++ b/web/src/main/java/com/turbodev/server/web/asset/fontext/FontExtResourceReference.java@@ -0,0 +1,31 @@+package com.turbodev.server.web.asset.fontext;++import java.util.List;++import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.HeaderItem;+import org.apache.wicket.request.resource.CssResourceReference;++import de.agilecoders.wicket.webjars.request.resource.WebjarsCssResourceReference;++public class FontExtResourceReference extends CssResourceReference {++ private static final long serialVersionUID = 1L;++ public FontExtResourceReference() {+ super(FontExtResourceReference.class, "fontext.css");+ }++ /*+ * FontExt overrides part of FontAwesome and we should make it appearing after+ * FontAwesome+ */+ @Override+ public List<HeaderItem> getDependencies() {+ List<HeaderItem> dependencies = super.getDependencies();+ dependencies.add(CssHeaderItem.forReference(new WebjarsCssResourceReference(+ "font-awesome/current/css/font-awesome.min.css")));+ return dependencies;+ }++}diff --git a/web/src/main/java/com/turbodev/server/web/page/base/fontext/cheatsheet.html b/web/src/main/java/com/turbodev/server/web/asset/fontext/cheatsheet.htmlsimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/page/base/fontext/cheatsheet.htmlrename to web/src/main/java/com/turbodev/server/web/asset/fontext/cheatsheet.htmldiff --git a/web/src/main/java/com/turbodev/server/web/page/base/fontext/fontext.css b/web/src/main/java/com/turbodev/server/web/asset/fontext/fontext.csssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/page/base/fontext/fontext.cssrename to web/src/main/java/com/turbodev/server/web/asset/fontext/fontext.cssdiff --git a/web/src/main/java/com/turbodev/server/web/page/base/fontext/fontext.eot b/web/src/main/java/com/turbodev/server/web/asset/fontext/fontext.eotsimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/page/base/fontext/fontext.eotrename to web/src/main/java/com/turbodev/server/web/asset/fontext/fontext.eotdiff --git a/web/src/main/java/com/turbodev/server/web/page/base/fontext/fontext.svg b/web/src/main/java/com/turbodev/server/web/asset/fontext/fontext.svgsimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/page/base/fontext/fontext.svgrename to web/src/main/java/com/turbodev/server/web/asset/fontext/fontext.svgdiff --git a/web/src/main/java/com/turbodev/server/web/page/base/fontext/fontext.ttf b/web/src/main/java/com/turbodev/server/web/asset/fontext/fontext.ttfsimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/page/base/fontext/fontext.ttfrename to web/src/main/java/com/turbodev/server/web/asset/fontext/fontext.ttfdiff --git a/web/src/main/java/com/turbodev/server/web/page/base/fontext/fontext.woff b/web/src/main/java/com/turbodev/server/web/asset/fontext/fontext.woffsimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/page/base/fontext/fontext.woffrename to web/src/main/java/com/turbodev/server/web/asset/fontext/fontext.woffdiff --git a/web/src/main/java/com/turbodev/server/web/assets/js/hotkeys/HotkeysResourceReference.java b/web/src/main/java/com/turbodev/server/web/asset/hotkeys/HotkeysResourceReference.javasimilarity index 93%rename from web/src/main/java/com/turbodev/server/web/assets/js/hotkeys/HotkeysResourceReference.javarename to web/src/main/java/com/turbodev/server/web/asset/hotkeys/HotkeysResourceReference.javaindex 040cffb409..c1098c88ff 100644--- a/web/src/main/java/com/turbodev/server/web/assets/js/hotkeys/HotkeysResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/asset/hotkeys/HotkeysResourceReference.java@@ -1,4 +1,4 @@-package com.turbodev.server.web.assets.js.hotkeys;+package com.turbodev.server.web.asset.hotkeys;import java.util.ArrayList;import java.util.List;diff --git a/web/src/main/java/com/turbodev/server/web/assets/js/hotkeys/jquery.hotkeys.js b/web/src/main/java/com/turbodev/server/web/asset/hotkeys/jquery.hotkeys.jssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/js/hotkeys/jquery.hotkeys.jsrename to web/src/main/java/com/turbodev/server/web/asset/hotkeys/jquery.hotkeys.jsdiff --git a/web/src/main/java/com/turbodev/server/web/assets/js/hover/HoverResourceReference.java b/web/src/main/java/com/turbodev/server/web/asset/hover/HoverResourceReference.javasimilarity index 93%rename from web/src/main/java/com/turbodev/server/web/assets/js/hover/HoverResourceReference.javarename to web/src/main/java/com/turbodev/server/web/asset/hover/HoverResourceReference.javaindex 90bbd20607..81feae1bff 100644--- a/web/src/main/java/com/turbodev/server/web/assets/js/hover/HoverResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/asset/hover/HoverResourceReference.java@@ -1,4 +1,4 @@-package com.turbodev.server.web.assets.js.hover;+package com.turbodev.server.web.asset.hover;import java.util.ArrayList;import java.util.List;diff --git a/web/src/main/java/com/turbodev/server/web/assets/js/hover/jquery.hover.js b/web/src/main/java/com/turbodev/server/web/asset/hover/jquery.hover.jssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/js/hover/jquery.hover.jsrename to web/src/main/java/com/turbodev/server/web/asset/hover/jquery.hover.jsdiff --git a/web/src/main/java/com/turbodev/server/web/assets/js/jqueryui/JQueryUIResourceReference.java b/web/src/main/java/com/turbodev/server/web/asset/jqueryui/JQueryUIResourceReference.javasimilarity index 95%rename from web/src/main/java/com/turbodev/server/web/assets/js/jqueryui/JQueryUIResourceReference.javarename to web/src/main/java/com/turbodev/server/web/asset/jqueryui/JQueryUIResourceReference.javaindex 1c00ec4c27..71cb7d1fa8 100644--- a/web/src/main/java/com/turbodev/server/web/assets/js/jqueryui/JQueryUIResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/asset/jqueryui/JQueryUIResourceReference.java@@ -1,4 +1,4 @@-package com.turbodev.server.web.assets.js.jqueryui;+package com.turbodev.server.web.asset.jqueryui;import java.util.ArrayList;import java.util.List;diff --git a/web/src/main/java/com/turbodev/server/web/assets/js/jqueryui/jquery-ui.min.css b/web/src/main/java/com/turbodev/server/web/asset/jqueryui/jquery-ui.min.csssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/js/jqueryui/jquery-ui.min.cssrename to web/src/main/java/com/turbodev/server/web/asset/jqueryui/jquery-ui.min.cssdiff --git a/web/src/main/java/com/turbodev/server/web/assets/js/jqueryui/jquery-ui.min.js b/web/src/main/java/com/turbodev/server/web/asset/jqueryui/jquery-ui.min.jssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/js/jqueryui/jquery-ui.min.jsrename to web/src/main/java/com/turbodev/server/web/asset/jqueryui/jquery-ui.min.jsdiff --git a/web/src/main/java/com/turbodev/server/web/assets/js/mousewheel/MouseWheelResourceReference.java b/web/src/main/java/com/turbodev/server/web/asset/mousewheel/MouseWheelResourceReference.javasimilarity index 93%rename from web/src/main/java/com/turbodev/server/web/assets/js/mousewheel/MouseWheelResourceReference.javarename to web/src/main/java/com/turbodev/server/web/asset/mousewheel/MouseWheelResourceReference.javaindex 66c23cd9f7..69db4d170c 100644--- a/web/src/main/java/com/turbodev/server/web/assets/js/mousewheel/MouseWheelResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/asset/mousewheel/MouseWheelResourceReference.java@@ -1,4 +1,4 @@-package com.turbodev.server.web.assets.js.mousewheel;+package com.turbodev.server.web.asset.mousewheel;import java.util.ArrayList;import java.util.List;diff --git a/web/src/main/java/com/turbodev/server/web/assets/js/mousewheel/jquery.mousewheel.js b/web/src/main/java/com/turbodev/server/web/asset/mousewheel/jquery.mousewheel.jssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/js/mousewheel/jquery.mousewheel.jsrename to web/src/main/java/com/turbodev/server/web/asset/mousewheel/jquery.mousewheel.jsdiff --git a/web/src/main/java/com/turbodev/server/web/assets/js/oneline/OnelineResourceReference.java b/web/src/main/java/com/turbodev/server/web/asset/oneline/OnelineResourceReference.javasimilarity index 93%rename from web/src/main/java/com/turbodev/server/web/assets/js/oneline/OnelineResourceReference.javarename to web/src/main/java/com/turbodev/server/web/asset/oneline/OnelineResourceReference.javaindex 34bb65fcaa..5edc022de1 100644--- a/web/src/main/java/com/turbodev/server/web/assets/js/oneline/OnelineResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/asset/oneline/OnelineResourceReference.java@@ -1,4 +1,4 @@-package com.turbodev.server.web.assets.js.oneline;+package com.turbodev.server.web.asset.oneline;import java.util.ArrayList;import java.util.List;diff --git a/web/src/main/java/com/turbodev/server/web/assets/js/oneline/jquery.oneline.js b/web/src/main/java/com/turbodev/server/web/asset/oneline/jquery.oneline.jssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/js/oneline/jquery.oneline.jsrename to web/src/main/java/com/turbodev/server/web/asset/oneline/jquery.oneline.jsdiff --git a/web/src/main/java/com/turbodev/server/web/asset/perfectscrollbar/PerfectScrollbarResourceReference.java b/web/src/main/java/com/turbodev/server/web/asset/perfectscrollbar/PerfectScrollbarResourceReference.javanew file mode 100644index 0000000000..4f8de08b66--- /dev/null+++ b/web/src/main/java/com/turbodev/server/web/asset/perfectscrollbar/PerfectScrollbarResourceReference.java@@ -0,0 +1,26 @@+package com.turbodev.server.web.asset.perfectscrollbar;++import java.util.List;++import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.HeaderItem;+import org.apache.wicket.request.resource.CssResourceReference;+import org.apache.wicket.request.resource.JavaScriptResourceReference;++public class PerfectScrollbarResourceReference extends JavaScriptResourceReference {++ private static final long serialVersionUID = 1L;++ public PerfectScrollbarResourceReference() {+ super(PerfectScrollbarResourceReference.class, "perfect-scrollbar.min.js");+ }++ @Override+ public List<HeaderItem> getDependencies() {+ List<HeaderItem> dependencies = super.getDependencies();+ dependencies.add(CssHeaderItem.forReference(new CssResourceReference(+ PerfectScrollbarResourceReference.class, "perfect-scrollbar.css")));+ return dependencies;+ }++}diff --git a/web/src/main/java/com/turbodev/server/web/asset/perfectscrollbar/perfect-scrollbar.css b/web/src/main/java/com/turbodev/server/web/asset/perfectscrollbar/perfect-scrollbar.cssnew file mode 100644index 0000000000..b4863922c5--- /dev/null+++ b/web/src/main/java/com/turbodev/server/web/asset/perfectscrollbar/perfect-scrollbar.css@@ -0,0 +1,116 @@+/*+ * Container style+ */+.ps {+ overflow: hidden !important;+ overflow-anchor: none;+ -ms-overflow-style: none;+ touch-action: auto;+ -ms-touch-action: auto;+}++/*+ * Scrollbar rail styles+ */+.ps__rail-x {+ display: none;+ opacity: 0;+ transition: background-color .2s linear, opacity .2s linear;+ -webkit-transition: background-color .2s linear, opacity .2s linear;+ height: 15px;+ /* there must be 'bottom' or 'top' for ps__rail-x */+ bottom: 0px;+ /* please don't change 'position' */+ position: absolute;+}++.ps__rail-y {+ display: none;+ opacity: 0;+ transition: background-color .2s linear, opacity .2s linear;+ -webkit-transition: background-color .2s linear, opacity .2s linear;+ width: 15px;+ /* there must be 'right' or 'left' for ps__rail-y */+ right: 0;+ /* please don't change 'position' */+ position: absolute;+}++.ps--active-x > .ps__rail-x,+.ps--active-y > .ps__rail-y {+ display: block;+ background-color: transparent;+}++.ps:hover > .ps__rail-x,+.ps:hover > .ps__rail-y,+.ps--focus > .ps__rail-x,+.ps--focus > .ps__rail-y,+.ps--scrolling-x > .ps__rail-x,+.ps--scrolling-y > .ps__rail-y {+ opacity: 0.6;+}++.ps .ps__rail-x:hover,+.ps .ps__rail-y:hover,+.ps .ps__rail-x:focus,+.ps .ps__rail-y:focus,+.ps .ps__rail-x.ps--clicking,+.ps .ps__rail-y.ps--clicking {+ background-color: #eee;+ opacity: 0.9;+}++/*+ * Scrollbar thumb styles+ */+.ps__thumb-x {+ background-color: #aaa;+ border-radius: 6px;+ transition: background-color .2s linear, height .2s ease-in-out;+ -webkit-transition: background-color .2s linear, height .2s ease-in-out;+ height: 6px;+ /* there must be 'bottom' for ps__thumb-x */+ bottom: 2px;+ /* please don't change 'position' */+ position: absolute;+}++.ps__thumb-y {+ background-color: #aaa;+ border-radius: 6px;+ transition: background-color .2s linear, width .2s ease-in-out;+ -webkit-transition: background-color .2s linear, width .2s ease-in-out;+ width: 6px;+ /* there must be 'right' for ps__thumb-y */+ right: 2px;+ /* please don't change 'position' */+ position: absolute;+}++.ps__rail-x:hover > .ps__thumb-x,+.ps__rail-x:focus > .ps__thumb-x,+.ps__rail-x.ps--clicking .ps__thumb-x {+ background-color: #999;+ height: 11px;+}++.ps__rail-y:hover > .ps__thumb-y,+.ps__rail-y:focus > .ps__thumb-y,+.ps__rail-y.ps--clicking .ps__thumb-y {+ background-color: #999;+ width: 11px;+}++/* MS supports */+@supports (-ms-overflow-style: none) {+ .ps {+ overflow: auto !important;+ }+}++@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {+ .ps {+ overflow: auto !important;+ }+}diff --git a/web/src/main/java/com/turbodev/server/web/asset/perfectscrollbar/perfect-scrollbar.min.js b/web/src/main/java/com/turbodev/server/web/asset/perfectscrollbar/perfect-scrollbar.min.jsnew file mode 100644index 0000000000..dfa8188b5b--- /dev/null+++ b/web/src/main/java/com/turbodev/server/web/asset/perfectscrollbar/perfect-scrollbar.min.js@@ -0,0 +1,6 @@+/*!+ * perfect-scrollbar v1.3.0+ * (c) 2017 Hyunje Jun+ * @license MIT+ */+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):t.PerfectScrollbar=e()}(this,function(){"use strict";function t(t){return getComputedStyle(t)}function e(t,e){for(var i in e){var r=e[i];"number"==typeof r&&(r+="px"),t.style[i]=r}return t}function i(t){var e=document.createElement("div");return e.className=t,e}function r(t,e){if(!v)throw new Error("No element matching method supported");return v.call(t,e)}function l(t){t.remove?t.remove():t.parentNode&&t.parentNode.removeChild(t)}function n(t,e){return Array.prototype.filter.call(t.children,function(t){return r(t,e)})}function o(t,e){var i=t.element.classList,r=m.state.scrolling(e);i.contains(r)?clearTimeout(Y[e]):i.add(r)}function s(t,e){Y[e]=setTimeout(function(){return t.isAlive&&t.element.classList.remove(m.state.scrolling(e))},t.settings.scrollingThreshold)}function a(t,e){o(t,e),s(t,e)}function c(t){if("function"==typeof window.CustomEvent)return new CustomEvent(t);var e=document.createEvent("CustomEvent");return e.initCustomEvent(t,!1,!1,void 0),e}function h(t,e,i,r,l){var n=i[0],o=i[1],s=i[2],h=i[3],u=i[4],d=i[5];void 0===r&&(r=!0),void 0===l&&(l=!1);var f=t.element;t.reach[h]=null,f[s]<1&&(t.reach[h]="start"),f[s]>t[n]-t[o]-1&&(t.reach[h]="end"),e&&(f.dispatchEvent(c("ps-scroll-"+h)),e<0?f.dispatchEvent(c("ps-scroll-"+u)):e>0&&f.dispatchEvent(c("ps-scroll-"+d)),r&&a(t,h)),t.reach[h]&&(e||l)&&f.dispatchEvent(c("ps-"+h+"-reach-"+t.reach[h]))}function u(t){return parseInt(t,10)||0}function d(t){return r(t,"input,[contenteditable]")||r(t,"select,[contenteditable]")||r(t,"textarea,[contenteditable]")||r(t,"button,[contenteditable]")}function f(e){var i=t(e);return u(i.width)+u(i.paddingLeft)+u(i.paddingRight)+u(i.borderLeftWidth)+u(i.borderRightWidth)}function p(t,e){return t.settings.minScrollbarLength&&(e=Math.max(e,t.settings.minScrollbarLength)),t.settings.maxScrollbarLength&&(e=Math.min(e,t.settings.maxScrollbarLength)),e}function b(t,i){var r={width:i.railXWidth};i.isRtl?r.left=i.negativeScrollAdjustment+t.scrollLeft+i.containerWidth-i.contentWidth:r.left=t.scrollLeft,i.isScrollbarXUsingBottom?r.bottom=i.scrollbarXBottom-t.scrollTop:r.top=i.scrollbarXTop+t.scrollTop,e(i.scrollbarXRail,r);var l={top:t.scrollTop,height:i.railYHeight};i.isScrollbarYUsingRight?i.isRtl?l.right=i.contentWidth-(i.negativeScrollAdjustment+t.scrollLeft)-i.scrollbarYRight-i.scrollbarYOuterWidth:l.right=i.scrollbarYRight-t.scrollLeft:i.isRtl?l.left=i.negativeScrollAdjustment+t.scrollLeft+2*i.containerWidth-i.contentWidth-i.scrollbarYLeft-i.scrollbarYOuterWidth:l.left=i.scrollbarYLeft+t.scrollLeft,e(i.scrollbarYRail,l),e(i.scrollbarX,{left:i.scrollbarXLeft,width:i.scrollbarXWidth-i.railBorderXWidth}),e(i.scrollbarY,{top:i.scrollbarYTop,height:i.scrollbarYHeight-i.railBorderYWidth})}function g(t,e){function i(e){p[d]=b+v*(e[a]-g),o(t,f),T(t),e.stopPropagation(),e.preventDefault()}function r(){s(t,f),t.event.unbind(t.ownerDocument,"mousemove",i)}var l=e[0],n=e[1],a=e[2],c=e[3],h=e[4],u=e[5],d=e[6],f=e[7],p=t.element,b=null,g=null,v=null;t.event.bind(t[h],"mousedown",function(e){b=p[d],g=e[a],v=(t[n]-t[l])/(t[c]-t[u]),t.event.bind(t.ownerDocument,"mousemove",i),t.event.once(t.ownerDocument,"mouseup",r),e.stopPropagation(),e.preventDefault()})}var v="undefined"!=typeof Element&&(Element.prototype.matches||Element.prototype.webkitMatchesSelector||Element.prototype.msMatchesSelector),m={main:"ps",element:{thumb:function(t){return"ps__thumb-"+t},rail:function(t){return"ps__rail-"+t},consuming:"ps__child--consume"},state:{focus:"ps--focus",active:function(t){return"ps--active-"+t},scrolling:function(t){return"ps--scrolling-"+t}}},Y={x:null,y:null},X=function(t){this.element=t,this.handlers={}},w={isEmpty:{configurable:!0}};X.prototype.bind=function(t,e){void 0===this.handlers[t]&&(this.handlers[t]=[]),this.handlers[t].push(e),this.element.addEventListener(t,e,!1)},X.prototype.unbind=function(t,e){var i=this;this.handlers[t]=this.handlers[t].filter(function(r){return!(!e||r===e)||(i.element.removeEventListener(t,r,!1),!1)})},X.prototype.unbindAll=function(){var t=this;for(var e in t.handlers)t.unbind(e)},w.isEmpty.get=function(){var t=this;return Object.keys(this.handlers).every(function(e){return 0===t.handlers[e].length})},Object.defineProperties(X.prototype,w);var y=function(){this.eventElements=[]};y.prototype.eventElement=function(t){var e=this.eventElements.filter(function(e){return e.element===t})[0];return e||(e=new X(t),this.eventElements.push(e)),e},y.prototype.bind=function(t,e,i){this.eventElement(t).bind(e,i)},y.prototype.unbind=function(t,e,i){var r=this.eventElement(t);r.unbind(e,i),r.isEmpty&&this.eventElements.splice(this.eventElements.indexOf(r),1)},y.prototype.unbindAll=function(){this.eventElements.forEach(function(t){return t.unbindAll()}),this.eventElements=[]},y.prototype.once=function(t,e,i){var r=this.eventElement(t),l=function(t){r.unbind(e,l),i(t)};r.bind(e,l)};var W=function(t,e,i,r,l){void 0===r&&(r=!0),void 0===l&&(l=!1);var n;if("top"===e)n=["contentHeight","containerHeight","scrollTop","y","up","down"];else{if("left"!==e)throw new Error("A proper axis should be provided");n=["contentWidth","containerWidth","scrollLeft","x","left","right"]}h(t,i,n,r,l)},L={isWebKit:"undefined"!=typeof document&&"WebkitAppearance"in document.documentElement.style,supportsTouch:"undefined"!=typeof window&&("ontouchstart"in window||window.DocumentTouch&&document instanceof window.DocumentTouch),supportsIePointer:"undefined"!=typeof navigator&&navigator.msMaxTouchPoints,isChrome:"undefined"!=typeof navigator&&/Chrome/i.test(navigator&&navigator.userAgent)},T=function(t){var e=t.element;t.containerWidth=e.clientWidth,t.containerHeight=e.clientHeight,t.contentWidth=e.scrollWidth,t.contentHeight=e.scrollHeight,e.contains(t.scrollbarXRail)||(n(e,m.element.rail("x")).forEach(function(t){return l(t)}),e.appendChild(t.scrollbarXRail)),e.contains(t.scrollbarYRail)||(n(e,m.element.rail("y")).forEach(function(t){return l(t)}),e.appendChild(t.scrollbarYRail)),!t.settings.suppressScrollX&&t.containerWidth+t.settings.scrollXMarginOffset<t.contentWidth?(t.scrollbarXActive=!0,t.railXWidth=t.containerWidth-t.railXMarginWidth,t.railXRatio=t.containerWidth/t.railXWidth,t.scrollbarXWidth=p(t,u(t.railXWidth*t.containerWidth/t.contentWidth)),t.scrollbarXLeft=u((t.negativeScrollAdjustment+e.scrollLeft)*(t.railXWidth-t.scrollbarXWidth)/(t.contentWidth-t.containerWidth))):t.scrollbarXActive=!1,!t.settings.suppressScrollY&&t.containerHeight+t.settings.scrollYMarginOffset<t.contentHeight?(t.scrollbarYActive=!0,t.railYHeight=t.containerHeight-t.railYMarginHeight,t.railYRatio=t.containerHeight/t.railYHeight,t.scrollbarYHeight=p(t,u(t.railYHeight*t.containerHeight/t.contentHeight)),t.scrollbarYTop=u(e.scrollTop*(t.railYHeight-t.scrollbarYHeight)/(t.contentHeight-t.containerHeight))):t.scrollbarYActive=!1,t.scrollbarXLeft>=t.railXWidth-t.scrollbarXWidth&&(t.scrollbarXLeft=t.railXWidth-t.scrollbarXWidth),t.scrollbarYTop>=t.railYHeight-t.scrollbarYHeight&&(t.scrollbarYTop=t.railYHeight-t.scrollbarYHeight),b(e,t),t.scrollbarXActive?e.classList.add(m.state.active("x")):(e.classList.remove(m.state.active("x")),t.scrollbarXWidth=0,t.scrollbarXLeft=0,e.scrollLeft=0),t.scrollbarYActive?e.classList.add(m.state.active("y")):(e.classList.remove(m.state.active("y")),t.scrollbarYHeight=0,t.scrollbarYTop=0,e.scrollTop=0)},R={"click-rail":function(t){t.event.bind(t.scrollbarY,"mousedown",function(t){return t.stopPropagation()}),t.event.bind(t.scrollbarYRail,"mousedown",function(e){var i=e.pageY-window.pageYOffset-t.scrollbarYRail.getBoundingClientRect().top>t.scrollbarYTop?1:-1;t.element.scrollTop+=i*t.containerHeight,T(t),e.stopPropagation()}),t.event.bind(t.scrollbarX,"mousedown",function(t){return t.stopPropagation()}),t.event.bind(t.scrollbarXRail,"mousedown",function(e){var i=e.pageX-window.pageXOffset-t.scrollbarXRail.getBoundingClientRect().left>t.scrollbarXLeft?1:-1;t.element.scrollLeft+=i*t.containerWidth,T(t),e.stopPropagation()})},"drag-thumb":function(t){g(t,["containerWidth","contentWidth","pageX","railXWidth","scrollbarX","scrollbarXWidth","scrollLeft","x"]),g(t,["containerHeight","contentHeight","pageY","railYHeight","scrollbarY","scrollbarYHeight","scrollTop","y"])},keyboard:function(t){function e(e,r){var l=i.scrollTop;if(0===e){if(!t.scrollbarYActive)return!1;if(0===l&&r>0||l>=t.contentHeight-t.containerHeight&&r<0)return!t.settings.wheelPropagation}var n=i.scrollLeft;if(0===r){if(!t.scrollbarXActive)return!1;if(0===n&&e<0||n>=t.contentWidth-t.containerWidth&&e>0)return!t.settings.wheelPropagation}return!0}var i=t.element,l=function(){return r(i,":hover")},n=function(){return r(t.scrollbarX,":focus")||r(t.scrollbarY,":focus")};t.event.bind(t.ownerDocument,"keydown",function(r){if(!(r.isDefaultPrevented&&r.isDefaultPrevented()||r.defaultPrevented)&&(l()||n())){var o=document.activeElement?document.activeElement:t.ownerDocument.activeElement;if(o){if("IFRAME"===o.tagName)o=o.contentDocument.activeElement;else for(;o.shadowRoot;)o=o.shadowRoot.activeElement;if(d(o))return}var s=0,a=0;switch(r.which){case 37:s=r.metaKey?-t.contentWidth:r.altKey?-t.containerWidth:-30;break;case 38:a=r.metaKey?t.contentHeight:r.altKey?t.containerHeight:30;break;case 39:s=r.metaKey?t.contentWidth:r.altKey?t.containerWidth:30;break;case 40:a=r.metaKey?-t.contentHeight:r.altKey?-t.containerHeight:-30;break;case 32:a=r.shiftKey?t.containerHeight:-t.containerHeight;break;case 33:a=t.containerHeight;break;case 34:a=-t.containerHeight;break;case 36:a=t.contentHeight;break;case 35:a=-t.contentHeight;break;default:return}t.settings.suppressScrollX&&0!==s||t.settings.suppressScrollY&&0!==a||(i.scrollTop-=a,i.scrollLeft+=s,T(t),e(s,a)&&r.preventDefault())}})},wheel:function(e){function i(t,i){var r=0===o.scrollTop,l=o.scrollTop+o.offsetHeight===o.scrollHeight,n=0===o.scrollLeft,s=o.scrollLeft+o.offsetWidth===o.offsetWidth;return!(Math.abs(i)>Math.abs(t)?r||l:n||s)||!e.settings.wheelPropagation}function r(t){var e=t.deltaX,i=-1*t.deltaY;return void 0!==e&&void 0!==i||(e=-1*t.wheelDeltaX/6,i=t.wheelDeltaY/6),t.deltaMode&&1===t.deltaMode&&(e*=10,i*=10),e!==e&&i!==i&&(e=0,i=t.wheelDelta),t.shiftKey?[-i,-e]:[e,i]}function l(e,i,r){if(!L.isWebKit&&o.querySelector("select:focus"))return!0;if(!o.contains(e))return!1;for(var l=e;l&&l!==o;){if(l.classList.contains(m.element.consuming))return!0;var n=t(l);if([n.overflow,n.overflowX,n.overflowY].join("").match(/(scroll|auto)/)){var s=l.scrollHeight-l.clientHeight;if(s>0&&!(0===l.scrollTop&&r>0||l.scrollTop===s&&r<0))return!0;var a=l.scrollLeft-l.clientWidth;if(a>0&&!(0===l.scrollLeft&&i<0||l.scrollLeft===a&&i>0))return!0}l=l.parentNode}return!1}function n(t){var n=r(t),s=n[0],a=n[1];if(!l(t.target,s,a)){var c=!1;e.settings.useBothWheelAxes?e.scrollbarYActive&&!e.scrollbarXActive?(a?o.scrollTop-=a*e.settings.wheelSpeed:o.scrollTop+=s*e.settings.wheelSpeed,c=!0):e.scrollbarXActive&&!e.scrollbarYActive&&(s?o.scrollLeft+=s*e.settings.wheelSpeed:o.scrollLeft-=a*e.settings.wheelSpeed,c=!0):(o.scrollTop-=a*e.settings.wheelSpeed,o.scrollLeft+=s*e.settings.wheelSpeed),T(e),(c=c||i(s,a))&&!t.ctrlKey&&(t.stopPropagation(),t.preventDefault())}}var o=e.element;void 0!==window.onwheel?e.event.bind(o,"wheel",n):void 0!==window.onmousewheel&&e.event.bind(o,"mousewheel",n)},touch:function(e){function i(t,i){var r=h.scrollTop,l=h.scrollLeft,n=Math.abs(t),o=Math.abs(i);if(o>n){if(i<0&&r===e.contentHeight-e.containerHeight||i>0&&0===r)return 0===window.scrollY&&i>0&&L.isChrome}else if(n>o&&(t<0&&l===e.contentWidth-e.containerWidth||t>0&&0===l))return!0;return!0}function r(t,i){h.scrollTop-=i,h.scrollLeft-=t,T(e)}function l(t){return t.targetTouches?t.targetTouches[0]:t}function n(t){return!(t.pointerType&&"pen"===t.pointerType&&0===t.buttons||(!t.targetTouches||1!==t.targetTouches.length)&&(!t.pointerType||"mouse"===t.pointerType||t.pointerType===t.MSPOINTER_TYPE_MOUSE))}function o(t){if(n(t)){var e=l(t);u.pageX=e.pageX,u.pageY=e.pageY,d=(new Date).getTime(),null!==p&&clearInterval(p)}}function s(e,i,r){if(!h.contains(e))return!1;for(var l=e;l&&l!==h;){if(l.classList.contains(m.element.consuming))return!0;var n=t(l);if([n.overflow,n.overflowX,n.overflowY].join("").match(/(scroll|auto)/)){var o=l.scrollHeight-l.clientHeight;if(o>0&&!(0===l.scrollTop&&r>0||l.scrollTop===o&&r<0))return!0;var s=l.scrollLeft-l.clientWidth;if(s>0&&!(0===l.scrollLeft&&i<0||l.scrollLeft===s&&i>0))return!0}l=l.parentNode}return!1}function a(t){if(n(t)){var e=l(t),o={pageX:e.pageX,pageY:e.pageY},a=o.pageX-u.pageX,c=o.pageY-u.pageY;if(s(t.target,a,c))return;r(a,c),u=o;var h=(new Date).getTime(),p=h-d;p>0&&(f.x=a/p,f.y=c/p,d=h),i(a,c)&&t.preventDefault()}}function c(){e.settings.swipeEasing&&(clearInterval(p),p=setInterval(function(){e.isInitialized?clearInterval(p):f.x||f.y?Math.abs(f.x)<.01&&Math.abs(f.y)<.01?clearInterval(p):(r(30*f.x,30*f.y),f.x*=.8,f.y*=.8):clearInterval(p)},10))}if(L.supportsTouch||L.supportsIePointer){var h=e.element,u={},d=0,f={},p=null;L.supportsTouch?(e.event.bind(h,"touchstart",o),e.event.bind(h,"touchmove",a),e.event.bind(h,"touchend",c)):L.supportsIePointer&&(window.PointerEvent?(e.event.bind(h,"pointerdown",o),e.event.bind(h,"pointermove",a),e.event.bind(h,"pointerup",c)):window.MSPointerEvent&&(e.event.bind(h,"MSPointerDown",o),e.event.bind(h,"MSPointerMove",a),e.event.bind(h,"MSPointerUp",c)))}}},H=function(r,l){var n=this;if(void 0===l&&(l={}),"string"==typeof r&&(r=document.querySelector(r)),!r||!r.nodeName)throw new Error("no element is specified to initialize PerfectScrollbar");this.element=r,r.classList.add(m.main),this.settings={handlers:["click-rail","drag-thumb","keyboard","wheel","touch"],maxScrollbarLength:null,minScrollbarLength:null,scrollingThreshold:1e3,scrollXMarginOffset:0,scrollYMarginOffset:0,suppressScrollX:!1,suppressScrollY:!1,swipeEasing:!0,useBothWheelAxes:!1,wheelPropagation:!1,wheelSpeed:1};for(var o in l)n.settings[o]=l[o];this.containerWidth=null,this.containerHeight=null,this.contentWidth=null,this.contentHeight=null;var s=function(){return r.classList.add(m.state.focus)},a=function(){return r.classList.remove(m.state.focus)};this.isRtl="rtl"===t(r).direction,this.isNegativeScroll=function(){var t=r.scrollLeft,e=null;return r.scrollLeft=-1,e=r.scrollLeft<0,r.scrollLeft=t,e}(),this.negativeScrollAdjustment=this.isNegativeScroll?r.scrollWidth-r.clientWidth:0,this.event=new y,this.ownerDocument=r.ownerDocument||document,this.scrollbarXRail=i(m.element.rail("x")),r.appendChild(this.scrollbarXRail),this.scrollbarX=i(m.element.thumb("x")),this.scrollbarXRail.appendChild(this.scrollbarX),this.scrollbarX.setAttribute("tabindex",0),this.event.bind(this.scrollbarX,"focus",s),this.event.bind(this.scrollbarX,"blur",a),this.scrollbarXActive=null,this.scrollbarXWidth=null,this.scrollbarXLeft=null;var c=t(this.scrollbarXRail);this.scrollbarXBottom=parseInt(c.bottom,10),isNaN(this.scrollbarXBottom)?(this.isScrollbarXUsingBottom=!1,this.scrollbarXTop=u(c.top)):this.isScrollbarXUsingBottom=!0,this.railBorderXWidth=u(c.borderLeftWidth)+u(c.borderRightWidth),e(this.scrollbarXRail,{display:"block"}),this.railXMarginWidth=u(c.marginLeft)+u(c.marginRight),e(this.scrollbarXRail,{display:""}),this.railXWidth=null,this.railXRatio=null,this.scrollbarYRail=i(m.element.rail("y")),r.appendChild(this.scrollbarYRail),this.scrollbarY=i(m.element.thumb("y")),this.scrollbarYRail.appendChild(this.scrollbarY),this.scrollbarY.setAttribute("tabindex",0),this.event.bind(this.scrollbarY,"focus",s),this.event.bind(this.scrollbarY,"blur",a),this.scrollbarYActive=null,this.scrollbarYHeight=null,this.scrollbarYTop=null;var h=t(this.scrollbarYRail);this.scrollbarYRight=parseInt(h.right,10),isNaN(this.scrollbarYRight)?(this.isScrollbarYUsingRight=!1,this.scrollbarYLeft=u(h.left)):this.isScrollbarYUsingRight=!0,this.scrollbarYOuterWidth=this.isRtl?f(this.scrollbarY):null,this.railBorderYWidth=u(h.borderTopWidth)+u(h.borderBottomWidth),e(this.scrollbarYRail,{display:"block"}),this.railYMarginHeight=u(h.marginTop)+u(h.marginBottom),e(this.scrollbarYRail,{display:""}),this.railYHeight=null,this.railYRatio=null,this.reach={x:r.scrollLeft<=0?"start":r.scrollLeft>=this.contentWidth-this.containerWidth?"end":null,y:r.scrollTop<=0?"start":r.scrollTop>=this.contentHeight-this.containerHeight?"end":null},this.isAlive=!0,this.settings.handlers.forEach(function(t){return R[t](n)}),this.lastScrollTop=r.scrollTop,this.lastScrollLeft=r.scrollLeft,this.event.bind(this.element,"scroll",function(t){return n.onScroll(t)}),T(this)};return H.prototype.update=function(){this.isAlive&&(this.negativeScrollAdjustment=this.isNegativeScroll?this.element.scrollWidth-this.element.clientWidth:0,e(this.scrollbarXRail,{display:"block"}),e(this.scrollbarYRail,{display:"block"}),this.railXMarginWidth=u(t(this.scrollbarXRail).marginLeft)+u(t(this.scrollbarXRail).marginRight),this.railYMarginHeight=u(t(this.scrollbarYRail).marginTop)+u(t(this.scrollbarYRail).marginBottom),e(this.scrollbarXRail,{display:"none"}),e(this.scrollbarYRail,{display:"none"}),T(this),W(this,"top",0,!1,!0),W(this,"left",0,!1,!0),e(this.scrollbarXRail,{display:""}),e(this.scrollbarYRail,{display:""}))},H.prototype.onScroll=function(t){this.isAlive&&(T(this),W(this,"top",this.element.scrollTop-this.lastScrollTop),W(this,"left",this.element.scrollLeft-this.lastScrollLeft),this.lastScrollTop=this.element.scrollTop,this.lastScrollLeft=this.element.scrollLeft)},H.prototype.destroy=function(){this.isAlive&&(this.event.unbindAll(),l(this.scrollbarX),l(this.scrollbarY),l(this.scrollbarXRail),l(this.scrollbarYRail),this.removePsClasses(),this.element=null,this.scrollbarX=null,this.scrollbarY=null,this.scrollbarXRail=null,this.scrollbarYRail=null,this.isAlive=!1)},H.prototype.removePsClasses=function(){this.element.className=this.element.className.split(" ").filter(function(t){return!t.match(/^ps([-_].+|)$/)}).join(" ")},H});\ No newline at end of filediff --git a/web/src/main/java/com/turbodev/server/web/assets/js/scrollintoview/ScrollIntoViewResourceReference.java b/web/src/main/java/com/turbodev/server/web/asset/scrollintoview/ScrollIntoViewResourceReference.javasimilarity index 93%rename from web/src/main/java/com/turbodev/server/web/assets/js/scrollintoview/ScrollIntoViewResourceReference.javarename to web/src/main/java/com/turbodev/server/web/asset/scrollintoview/ScrollIntoViewResourceReference.javaindex 9346e882e3..7be72263a3 100644--- a/web/src/main/java/com/turbodev/server/web/assets/js/scrollintoview/ScrollIntoViewResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/asset/scrollintoview/ScrollIntoViewResourceReference.java@@ -1,4 +1,4 @@-package com.turbodev.server.web.assets.js.scrollintoview;+package com.turbodev.server.web.asset.scrollintoview;import java.util.ArrayList;import java.util.List;diff --git a/web/src/main/java/com/turbodev/server/web/assets/js/scrollintoview/jquery.scrollintoview.js b/web/src/main/java/com/turbodev/server/web/asset/scrollintoview/jquery.scrollintoview.jssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/js/scrollintoview/jquery.scrollintoview.jsrename to web/src/main/java/com/turbodev/server/web/asset/scrollintoview/jquery.scrollintoview.jsdiff --git a/web/src/main/java/com/turbodev/server/web/assets/js/selectionpopover/SelectionPopoverResourceReference.java b/web/src/main/java/com/turbodev/server/web/asset/selectionpopover/SelectionPopoverResourceReference.javasimilarity index 94%rename from web/src/main/java/com/turbodev/server/web/assets/js/selectionpopover/SelectionPopoverResourceReference.javarename to web/src/main/java/com/turbodev/server/web/asset/selectionpopover/SelectionPopoverResourceReference.javaindex bd2552421b..c260c7fa8d 100644--- a/web/src/main/java/com/turbodev/server/web/assets/js/selectionpopover/SelectionPopoverResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/asset/selectionpopover/SelectionPopoverResourceReference.java@@ -1,4 +1,4 @@-package com.turbodev.server.web.assets.js.selectionpopover;+package com.turbodev.server.web.asset.selectionpopover;import java.util.ArrayList;import java.util.List;diff --git a/web/src/main/java/com/turbodev/server/web/assets/js/selectionpopover/jquery.selectionpopover.css b/web/src/main/java/com/turbodev/server/web/asset/selectionpopover/jquery.selectionpopover.csssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/js/selectionpopover/jquery.selectionpopover.cssrename to web/src/main/java/com/turbodev/server/web/asset/selectionpopover/jquery.selectionpopover.cssdiff --git a/web/src/main/java/com/turbodev/server/web/assets/js/selectionpopover/jquery.selectionpopover.js b/web/src/main/java/com/turbodev/server/web/asset/selectionpopover/jquery.selectionpopover.jssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/js/selectionpopover/jquery.selectionpopover.jsrename to web/src/main/java/com/turbodev/server/web/asset/selectionpopover/jquery.selectionpopover.jsdiff --git a/web/src/main/java/com/turbodev/server/web/assets/js/snapsvg/SnapSvgResourceReference.java b/web/src/main/java/com/turbodev/server/web/asset/snapsvg/SnapSvgResourceReference.javasimilarity index 85%rename from web/src/main/java/com/turbodev/server/web/assets/js/snapsvg/SnapSvgResourceReference.javarename to web/src/main/java/com/turbodev/server/web/asset/snapsvg/SnapSvgResourceReference.javaindex c72a8145d0..dd32093b65 100644--- a/web/src/main/java/com/turbodev/server/web/assets/js/snapsvg/SnapSvgResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/asset/snapsvg/SnapSvgResourceReference.java@@ -1,4 +1,4 @@-package com.turbodev.server.web.assets.js.snapsvg;+package com.turbodev.server.web.asset.snapsvg;import org.apache.wicket.request.resource.JavaScriptResourceReference;diff --git a/web/src/main/java/com/turbodev/server/web/assets/js/snapsvg/snap.svg-min.js b/web/src/main/java/com/turbodev/server/web/asset/snapsvg/snap.svg-min.jssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/js/snapsvg/snap.svg-min.jsrename to web/src/main/java/com/turbodev/server/web/asset/snapsvg/snap.svg-min.jsdiff --git a/web/src/main/java/com/turbodev/server/web/assets/js/textareacaretposition/TextareaCaretPositionResourceReference.java b/web/src/main/java/com/turbodev/server/web/asset/textareacaretposition/TextareaCaretPositionResourceReference.javasimilarity index 84%rename from web/src/main/java/com/turbodev/server/web/assets/js/textareacaretposition/TextareaCaretPositionResourceReference.javarename to web/src/main/java/com/turbodev/server/web/asset/textareacaretposition/TextareaCaretPositionResourceReference.javaindex 28930fe69b..a4f012fd2c 100644--- a/web/src/main/java/com/turbodev/server/web/assets/js/textareacaretposition/TextareaCaretPositionResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/asset/textareacaretposition/TextareaCaretPositionResourceReference.java@@ -1,4 +1,4 @@-package com.turbodev.server.web.assets.js.textareacaretposition;+package com.turbodev.server.web.asset.textareacaretposition;import org.apache.wicket.request.resource.JavaScriptResourceReference;diff --git a/web/src/main/java/com/turbodev/server/web/assets/js/textareacaretposition/textarea-caret-position.js b/web/src/main/java/com/turbodev/server/web/asset/textareacaretposition/textarea-caret-position.jssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/js/textareacaretposition/textarea-caret-position.jsrename to web/src/main/java/com/turbodev/server/web/asset/textareacaretposition/textarea-caret-position.jsdiff --git a/web/src/main/java/com/turbodev/server/web/assets/js/uri/URI.js b/web/src/main/java/com/turbodev/server/web/asset/uri/URI.jssimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/js/uri/URI.jsrename to web/src/main/java/com/turbodev/server/web/asset/uri/URI.jsdiff --git a/web/src/main/java/com/turbodev/server/web/assets/js/uri/URIResourceReference.java b/web/src/main/java/com/turbodev/server/web/asset/uri/URIResourceReference.javasimilarity index 85%rename from web/src/main/java/com/turbodev/server/web/assets/js/uri/URIResourceReference.javarename to web/src/main/java/com/turbodev/server/web/asset/uri/URIResourceReference.javaindex b653caca88..6bd5b5e4ed 100644--- a/web/src/main/java/com/turbodev/server/web/assets/js/uri/URIResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/asset/uri/URIResourceReference.java@@ -1,4 +1,4 @@-package com.turbodev.server.web.assets.js.uri;+package com.turbodev.server.web.asset.uri;import org.apache.wicket.request.resource.JavaScriptResourceReference;diff --git a/web/src/main/java/com/turbodev/server/web/assets/Assets.java b/web/src/main/java/com/turbodev/server/web/assets/Assets.javadeleted file mode 100644index fa985aec6d..0000000000--- a/web/src/main/java/com/turbodev/server/web/assets/Assets.java+++ /dev/null@@ -1,5 +0,0 @@-package com.turbodev.server.web.assets;--public class Assets {--}diff --git a/web/src/main/java/com/turbodev/server/web/behavior/OnTypingDoneBehavior.java b/web/src/main/java/com/turbodev/server/web/behavior/OnTypingDoneBehavior.javaindex fc62b7295f..fd318c04ec 100644--- a/web/src/main/java/com/turbodev/server/web/behavior/OnTypingDoneBehavior.java+++ b/web/src/main/java/com/turbodev/server/web/behavior/OnTypingDoneBehavior.java@@ -10,7 +10,7 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.form.FormComponent;-import com.turbodev.server.web.assets.js.doneevents.DoneEventsResourceReference;+import com.turbodev.server.web.asset.doneevents.DoneEventsResourceReference;@SuppressWarnings("serial")public abstract class OnTypingDoneBehavior extends AjaxFormComponentUpdatingBehavior{diff --git a/web/src/main/java/com/turbodev/server/web/behavior/clipboard/CopyClipboardResourceReference.java b/web/src/main/java/com/turbodev/server/web/behavior/clipboard/CopyClipboardResourceReference.javaindex d52f57ce60..60e78ac925 100644--- a/web/src/main/java/com/turbodev/server/web/behavior/clipboard/CopyClipboardResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/behavior/clipboard/CopyClipboardResourceReference.java@@ -5,7 +5,7 @@ import java.util.List;import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import com.turbodev.server.web.assets.js.clipboard.ClipboardResourceReference;+import com.turbodev.server.web.asset.clipboard.ClipboardResourceReference;import com.turbodev.server.web.page.base.BaseDependentResourceReference;public class CopyClipboardResourceReference extends BaseDependentResourceReference {diff --git a/web/src/main/java/com/turbodev/server/web/behavior/dragdrop/DragDropResourceReference.java b/web/src/main/java/com/turbodev/server/web/behavior/dragdrop/DragDropResourceReference.javaindex a2a9336abb..c5311cfb1b 100644--- a/web/src/main/java/com/turbodev/server/web/behavior/dragdrop/DragDropResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/behavior/dragdrop/DragDropResourceReference.java@@ -6,7 +6,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import com.turbodev.server.web.assets.js.jqueryui.JQueryUIResourceReference;+import com.turbodev.server.web.asset.jqueryui.JQueryUIResourceReference;import com.turbodev.server.web.page.base.BaseDependentCssResourceReference;import com.turbodev.server.web.page.base.BaseDependentResourceReference;diff --git a/web/src/main/java/com/turbodev/server/web/behavior/infinitescroll/InfiniteScrollResourceReference.java b/web/src/main/java/com/turbodev/server/web/behavior/infinitescroll/InfiniteScrollResourceReference.javaindex e89b745bc6..a08655c8fa 100644--- a/web/src/main/java/com/turbodev/server/web/behavior/infinitescroll/InfiniteScrollResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/behavior/infinitescroll/InfiniteScrollResourceReference.java@@ -5,7 +5,7 @@ import java.util.List;import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import com.turbodev.server.web.assets.js.scrollintoview.ScrollIntoViewResourceReference;+import com.turbodev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference;import com.turbodev.server.web.page.base.BaseDependentResourceReference;public class InfiniteScrollResourceReference extends BaseDependentResourceReference {diff --git a/web/src/main/java/com/turbodev/server/web/behavior/inputassist/InputAssistResourceReference.java b/web/src/main/java/com/turbodev/server/web/behavior/inputassist/InputAssistResourceReference.javaindex 1cc3ffa77f..2010dfc8dd 100644--- a/web/src/main/java/com/turbodev/server/web/behavior/inputassist/InputAssistResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/behavior/inputassist/InputAssistResourceReference.java@@ -6,10 +6,10 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import com.turbodev.server.web.assets.js.caret.CaretResourceReference;-import com.turbodev.server.web.assets.js.hotkeys.HotkeysResourceReference;-import com.turbodev.server.web.assets.js.scrollintoview.ScrollIntoViewResourceReference;-import com.turbodev.server.web.assets.js.textareacaretposition.TextareaCaretPositionResourceReference;+import com.turbodev.server.web.asset.caret.CaretResourceReference;+import com.turbodev.server.web.asset.hotkeys.HotkeysResourceReference;+import com.turbodev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference;+import com.turbodev.server.web.asset.textareacaretposition.TextareaCaretPositionResourceReference;import com.turbodev.server.web.page.base.BaseDependentCssResourceReference;import com.turbodev.server.web.page.base.BaseDependentResourceReference;diff --git a/web/src/main/java/com/turbodev/server/web/behavior/sortable/SortBehavior.java b/web/src/main/java/com/turbodev/server/web/behavior/sortable/SortBehavior.javaindex b63a232ce5..b8f70418e2 100644--- a/web/src/main/java/com/turbodev/server/web/behavior/sortable/SortBehavior.java+++ b/web/src/main/java/com/turbodev/server/web/behavior/sortable/SortBehavior.java@@ -9,7 +9,7 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.head.OnLoadHeaderItem;import org.apache.wicket.request.cycle.RequestCycle;-import com.turbodev.server.web.assets.js.jqueryui.JQueryUIResourceReference;+import com.turbodev.server.web.asset.jqueryui.JQueryUIResourceReference;import com.turbodev.server.web.behavior.AbstractPostAjaxBehavior;public abstract class SortBehavior extends AbstractPostAjaxBehavior {diff --git a/web/src/main/java/com/turbodev/server/web/component/branchpicker/BranchSelectorResourceReference.java b/web/src/main/java/com/turbodev/server/web/component/branchpicker/BranchSelectorResourceReference.javaindex 1bbff30286..ccb66feb1a 100644--- a/web/src/main/java/com/turbodev/server/web/component/branchpicker/BranchSelectorResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/component/branchpicker/BranchSelectorResourceReference.java@@ -7,7 +7,7 @@ import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.request.resource.CssResourceReference;-import com.turbodev.server.web.assets.js.hotkeys.HotkeysResourceReference;+import com.turbodev.server.web.asset.hotkeys.HotkeysResourceReference;import com.turbodev.server.web.page.base.BaseDependentResourceReference;public class BranchSelectorResourceReference extends BaseDependentResourceReference {diff --git a/web/src/main/java/com/turbodev/server/web/component/comment/CodeCommentListPanel.html b/web/src/main/java/com/turbodev/server/web/component/comment/CodeCommentListPanel.htmlindex 79f6c7b14b..692606b80d 100644--- a/web/src/main/java/com/turbodev/server/web/component/comment/CodeCommentListPanel.html+++ b/web/src/main/java/com/turbodev/server/web/component/comment/CodeCommentListPanel.html@@ -2,7 +2,8 @@<table class="code-comments"><tr><td class="filter">- <div class="head">Filter options</div>+ <h4>Filter options</h4>+ <hr/><div class="body"><div class="btn-group shortcuts"><a wicket:id="myComments" class="btn btn-sm btn-default">My</a>diff --git a/web/src/main/java/com/turbodev/server/web/component/comment/CodeCommentPanel.java b/web/src/main/java/com/turbodev/server/web/component/comment/CodeCommentPanel.javaindex f11dff7ef8..d91916ff95 100644--- a/web/src/main/java/com/turbodev/server/web/component/comment/CodeCommentPanel.java+++ b/web/src/main/java/com/turbodev/server/web/component/comment/CodeCommentPanel.java@@ -47,7 +47,7 @@ import com.turbodev.server.model.PullRequest;import com.turbodev.server.model.User;import com.turbodev.server.model.support.CompareContext;import com.turbodev.server.security.SecurityUtils;-import com.turbodev.server.web.assets.js.caret.CaretResourceReference;+import com.turbodev.server.web.asset.caret.CaretResourceReference;import com.turbodev.server.web.component.avatar.AvatarLink;import com.turbodev.server.web.component.link.UserLink;import com.turbodev.server.web.component.markdown.AttachmentSupport;diff --git a/web/src/main/java/com/turbodev/server/web/component/comment/code-comment.css b/web/src/main/java/com/turbodev/server/web/component/comment/code-comment.cssindex c14a39581e..b0a0513d13 100644--- a/web/src/main/java/com/turbodev/server/web/component/comment/code-comment.css+++ b/web/src/main/java/com/turbodev/server/web/component/comment/code-comment.css@@ -1,24 +1,16 @@.code-comments td.filter {width: 25%;- border: 1px solid #DDD;-}-.code-comments td.filter>.head {- font-size: 16px;- border-bottom: 1px solid #DDD;- padding: 8px 12px;- background: #F2F2F2;+ border: 2px solid #E0E0E0;+ padding: 20px;}.code-comments td.filter>.body>.shortcuts {margin-bottom: 12px;}-.code-comments td.filter>.body {- padding: 12px;-}.code-comments td.spacing {width: 20px;}.code-comments td.result {- border: 1px solid #DDD;+ border: 2px solid #E0E0E0;}.code-comments td.comment {padding: 20px 20px 0 20px;diff --git a/web/src/main/java/com/turbodev/server/web/component/commitgraph/CommitGraphResourceReference.java b/web/src/main/java/com/turbodev/server/web/component/commitgraph/CommitGraphResourceReference.javaindex 0bc03d37ad..55d19cc923 100644--- a/web/src/main/java/com/turbodev/server/web/component/commitgraph/CommitGraphResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/component/commitgraph/CommitGraphResourceReference.java@@ -7,7 +7,7 @@ import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.request.resource.CssResourceReference;-import com.turbodev.server.web.assets.js.snapsvg.SnapSvgResourceReference;+import com.turbodev.server.web.asset.snapsvg.SnapSvgResourceReference;import com.turbodev.server.web.page.base.BaseDependentResourceReference;public class CommitGraphResourceReference extends BaseDependentResourceReference {diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/blob/text/TextDiffResourceReference.java b/web/src/main/java/com/turbodev/server/web/component/diff/blob/text/TextDiffResourceReference.javaindex 24cf371b50..e0bf0a7216 100644--- a/web/src/main/java/com/turbodev/server/web/component/diff/blob/text/TextDiffResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/component/diff/blob/text/TextDiffResourceReference.java@@ -7,9 +7,9 @@ import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.request.resource.CssResourceReference;-import com.turbodev.server.web.assets.js.clipboard.ClipboardResourceReference;-import com.turbodev.server.web.assets.js.hover.HoverResourceReference;-import com.turbodev.server.web.assets.js.selectionpopover.SelectionPopoverResourceReference;+import com.turbodev.server.web.asset.clipboard.ClipboardResourceReference;+import com.turbodev.server.web.asset.hover.HoverResourceReference;+import com.turbodev.server.web.asset.selectionpopover.SelectionPopoverResourceReference;import com.turbodev.server.web.page.base.BaseDependentResourceReference;import de.agilecoders.wicket.webjars.request.resource.WebjarsCssResourceReference;diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/blob/text/text-diff.css b/web/src/main/java/com/turbodev/server/web/component/diff/blob/text/text-diff.cssindex 8ba9110637..4ac7dafcc9 100644--- a/web/src/main/java/com/turbodev/server/web/component/diff/blob/text/text-diff.css+++ b/web/src/main/java/com/turbodev/server/web/component/diff/blob/text/text-diff.css@@ -1,10 +1,10 @@.text-diff {- border: 1px solid #D8D8D8;+ border: 1px solid #E0E0E0;position: relative;}.text-diff>.head {padding: 8px;- border-bottom: 1px solid #D8D8D8;+ border-bottom: 1px solid #E0E0E0;}.text-diff>.head .actions>a {margin-right: 0;diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/revision/RevisionDiffResourceReference.java b/web/src/main/java/com/turbodev/server/web/component/diff/revision/RevisionDiffResourceReference.javaindex 4f4245e7df..df82200b85 100644--- a/web/src/main/java/com/turbodev/server/web/component/diff/revision/RevisionDiffResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/component/diff/revision/RevisionDiffResourceReference.java@@ -6,8 +6,8 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import com.turbodev.server.web.assets.js.cookies.CookiesResourceReference;-import com.turbodev.server.web.assets.js.jqueryui.JQueryUIResourceReference;+import com.turbodev.server.web.asset.cookies.CookiesResourceReference;+import com.turbodev.server.web.asset.jqueryui.JQueryUIResourceReference;import com.turbodev.server.web.page.base.BaseDependentCssResourceReference;import com.turbodev.server.web.page.base.BaseDependentResourceReference;diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/revision/revision-diff.css b/web/src/main/java/com/turbodev/server/web/component/diff/revision/revision-diff.cssindex 1048cede40..c97ff25e4b 100644--- a/web/src/main/java/com/turbodev/server/web/component/diff/revision/revision-diff.css+++ b/web/src/main/java/com/turbodev/server/web/component/diff/revision/revision-diff.css@@ -86,6 +86,7 @@}.revision-diff>.body>.detail>.diffs>.diff {margin-bottom: 20px;+ background: white;}.revision-diff>.body>.detail {position: relative;diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/revision/revision-diff.js b/web/src/main/java/com/turbodev/server/web/component/diff/revision/revision-diff.jsindex 00add0c956..1524f0f6ed 100644--- a/web/src/main/java/com/turbodev/server/web/component/diff/revision/revision-diff.js+++ b/web/src/main/java/com/turbodev/server/web/component/diff/revision/revision-diff.js@@ -65,23 +65,26 @@ turbodev.server.revisionDiff = {var scrollTop = $(window).scrollTop();$comment.css("left", $detail.offset().left - scrollLeft);var topOffset = $diffs.offset().top - scrollTop;- if (topOffset <= 0) {- $comment.css("top", 0);+ var headHeight = $("#layout>.head").outerHeight();+ var footHeight = $("#layout>.foot").outerHeight();+ if (topOffset <= headHeight) {+ $comment.css("top", headHeight);} else {$comment.css("top", topOffset);}var $lastDiff = $diffs.children().last();var commentHeight;if ($lastDiff.length != 0) {- commentHeight = $lastDiff.offset().top + $lastDiff.height() - scrollTop;+ commentHeight = $lastDiff.offset().top + $lastDiff.height() - scrollTop - headHeight - footHeight;} else {- commentHeight = $diffs.offset().top + $diffs.height() - scrollTop;+ commentHeight = $diffs.offset().top + $diffs.height() - scrollTop - headHeight - footHeight;}- var minCommentHeight = windowHeight-52;+ var maxCommentHeight = windowHeight - headHeight - footHeight;+ var minCommentHeight = maxCommentHeight - 52;if (commentHeight < minCommentHeight)commentHeight = minCommentHeight;- else if (commentHeight > windowHeight)- commentHeight = windowHeight;+ else if (commentHeight > maxCommentHeight)+ commentHeight = maxCommentHeight;var $commentResizeHandle = $comment.children(".ui-resizable-handle");$commentResizeHandle.outerHeight(commentHeight - 2);var $commentHead = $comment.find(">.content>.head");@@ -100,7 +103,7 @@ turbodev.server.revisionDiff = {var commentWidthCookieKey = "revisionDiff.comment.width";var commentWidth = Cookies.get(commentWidthCookieKey);if (!commentWidth)- commentWidth = 400;+ commentWidth = $(".revision-diff").outerWidth()/3;$comment.outerWidth(commentWidth);var $commentResizeHandle = $comment.children(".ui-resizable-handle");var $diffs = $(".revision-diff>.body>.detail>.diffs");diff --git a/web/src/main/java/com/turbodev/server/web/component/dropzonefield/DropzoneFieldResourceReference.java b/web/src/main/java/com/turbodev/server/web/component/dropzonefield/DropzoneFieldResourceReference.javaindex 2010f05fe7..7a1a87ec0c 100644--- a/web/src/main/java/com/turbodev/server/web/component/dropzonefield/DropzoneFieldResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/component/dropzonefield/DropzoneFieldResourceReference.java@@ -6,7 +6,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import com.turbodev.server.web.assets.js.dropzone.DropzoneResourceReference;+import com.turbodev.server.web.asset.dropzone.DropzoneResourceReference;import com.turbodev.server.web.page.base.BaseDependentCssResourceReference;import com.turbodev.server.web.page.base.BaseDependentResourceReference;diff --git a/web/src/main/java/com/turbodev/server/web/component/floating/floating.css b/web/src/main/java/com/turbodev/server/web/component/floating/floating.cssindex 7a9d99ca95..adfd27ffc1 100644--- a/web/src/main/java/com/turbodev/server/web/component/floating/floating.css+++ b/web/src/main/java/com/turbodev/server/web/component/floating/floating.css@@ -4,6 +4,7 @@border: 1px solid rgba(0, 0, 0, 0.2);box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);position: absolute;+ border-radius: 3px;z-index: 2000;}diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/MarkdownResourceReference.java b/web/src/main/java/com/turbodev/server/web/component/markdown/MarkdownResourceReference.javaindex 1ab1ec7040..a82c9bbadc 100644--- a/web/src/main/java/com/turbodev/server/web/component/markdown/MarkdownResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/component/markdown/MarkdownResourceReference.java@@ -6,13 +6,13 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import com.turbodev.server.web.assets.js.atwho.AtWhoResourceReference;-import com.turbodev.server.web.assets.js.caret.CaretResourceReference;-import com.turbodev.server.web.assets.js.codemirror.CodeMirrorResourceReference;-import com.turbodev.server.web.assets.js.cookies.CookiesResourceReference;-import com.turbodev.server.web.assets.js.doneevents.DoneEventsResourceReference;-import com.turbodev.server.web.assets.js.jqueryui.JQueryUIResourceReference;-import com.turbodev.server.web.assets.js.textareacaretposition.TextareaCaretPositionResourceReference;+import com.turbodev.server.web.asset.atwho.AtWhoResourceReference;+import com.turbodev.server.web.asset.caret.CaretResourceReference;+import com.turbodev.server.web.asset.codemirror.CodeMirrorResourceReference;+import com.turbodev.server.web.asset.cookies.CookiesResourceReference;+import com.turbodev.server.web.asset.doneevents.DoneEventsResourceReference;+import com.turbodev.server.web.asset.jqueryui.JQueryUIResourceReference;+import com.turbodev.server.web.asset.textareacaretposition.TextareaCaretPositionResourceReference;import com.turbodev.server.web.page.base.BaseDependentCssResourceReference;import com.turbodev.server.web.page.base.BaseDependentResourceReference;diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/markdown.css b/web/src/main/java/com/turbodev/server/web/component/markdown/markdown.cssindex 3952786bb2..6707f6137d 100644--- a/web/src/main/java/com/turbodev/server/web/component/markdown/markdown.css+++ b/web/src/main/java/com/turbodev/server/web/component/markdown/markdown.css@@ -28,7 +28,7 @@ body.fullscreen {}.markdown-editor>.head {background: white;- border: 1px solid #CCC;+ border: 1px solid #E0E0E0;border-bottom: none;border-radius: 4px 4px 0 0;padding: 4px;@@ -45,13 +45,13 @@ body.fullscreen {}.markdown-editor>.head>.actions .separator {display: block;- border-left: 1px solid #CCC;+ border-left: 1px solid #E0E0E0;margin-right: 4px;height: 24px;}.markdown-editor>.head>.actions>div>a:hover, .markdown-editor>.head>.actions>div>a.active {background: #EEE;- border: 1px solid #CCC;+ border: 1px solid #E0E0E0;}.markdown-editor>.head>.actions .dropdown .active:BEFORE {@@ -96,7 +96,7 @@ body.fullscreen {}.markdown-editor>.body>.preview>.markdown-rendered {- border: 1px solid #CCC;+ border: 1px solid #E0E0E0;padding: 8px;border-radius: 0 0 4px 4px;background: white;@@ -151,7 +151,7 @@ body.fullscreen {}.markdown-editor>.body>.edit>textarea {- border: 1px solid #CCC;+ border: 1px solid #E0E0E0;border-radius: 0 0 4px 4px;overflow: auto;width: 100%;diff --git a/web/src/main/java/com/turbodev/server/web/component/projectselector/ProjectSelectorResourceReference.java b/web/src/main/java/com/turbodev/server/web/component/projectselector/ProjectSelectorResourceReference.javaindex c1010527f5..438fb4dfa3 100644--- a/web/src/main/java/com/turbodev/server/web/component/projectselector/ProjectSelectorResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/component/projectselector/ProjectSelectorResourceReference.java@@ -7,8 +7,8 @@ import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.request.resource.CssResourceReference;-import com.turbodev.server.web.assets.js.hotkeys.HotkeysResourceReference;-import com.turbodev.server.web.assets.js.scrollintoview.ScrollIntoViewResourceReference;+import com.turbodev.server.web.asset.hotkeys.HotkeysResourceReference;+import com.turbodev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference;import com.turbodev.server.web.page.base.BaseDependentResourceReference;public class ProjectSelectorResourceReference extends BaseDependentResourceReference {diff --git a/web/src/main/java/com/turbodev/server/web/component/revisionpicker/RevisionSelectorResourceReference.java b/web/src/main/java/com/turbodev/server/web/component/revisionpicker/RevisionSelectorResourceReference.javaindex 10eebaf85f..9e1d17d1dc 100644--- a/web/src/main/java/com/turbodev/server/web/component/revisionpicker/RevisionSelectorResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/component/revisionpicker/RevisionSelectorResourceReference.java@@ -7,7 +7,7 @@ import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.request.resource.CssResourceReference;-import com.turbodev.server.web.assets.js.hotkeys.HotkeysResourceReference;+import com.turbodev.server.web.asset.hotkeys.HotkeysResourceReference;import com.turbodev.server.web.page.base.BaseDependentResourceReference;public class RevisionSelectorResourceReference extends BaseDependentResourceReference {diff --git a/web/src/main/java/com/turbodev/server/web/component/revisionpicker/revision-picker.css b/web/src/main/java/com/turbodev/server/web/component/revisionpicker/revision-picker.cssindex de2ef877c3..a9ae1d8d87 100644--- a/web/src/main/java/com/turbodev/server/web/component/revisionpicker/revision-picker.css+++ b/web/src/main/java/com/turbodev/server/web/component/revisionpicker/revision-picker.css@@ -6,3 +6,6 @@text-decoration: none;font-size: 16px;}+.project-and-revision>a.btn {+ font-size: inherit;+}diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/DragAndDropBehavior.java b/web/src/main/java/com/turbodev/server/web/component/select2/DragAndDropBehavior.javaindex 094d50bd11..85d2e00217 100644--- a/web/src/main/java/com/turbodev/server/web/component/select2/DragAndDropBehavior.java+++ b/web/src/main/java/com/turbodev/server/web/component/select2/DragAndDropBehavior.java@@ -6,7 +6,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;-import com.turbodev.server.web.assets.js.jqueryui.JQueryUIResourceReference;+import com.turbodev.server.web.asset.jqueryui.JQueryUIResourceReference;/*** Adds drag & drop behavior to Select2MultiChoice components, i.e. the list ofdiff --git a/web/src/main/java/com/turbodev/server/web/component/select2/Select2ResourceReference.java b/web/src/main/java/com/turbodev/server/web/component/select2/Select2ResourceReference.javaindex 4b65bf6257..101f0f2f17 100644--- a/web/src/main/java/com/turbodev/server/web/component/select2/Select2ResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/component/select2/Select2ResourceReference.java@@ -6,7 +6,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import com.turbodev.server.web.assets.js.mousewheel.MouseWheelResourceReference;+import com.turbodev.server.web.asset.mousewheel.MouseWheelResourceReference;import com.turbodev.server.web.page.base.BaseDependentResourceReference;public class Select2ResourceReference extends BaseDependentResourceReference {diff --git a/web/src/main/java/com/turbodev/server/web/component/sidebar/SidebarPanel.html b/web/src/main/java/com/turbodev/server/web/component/sidebar/SidebarPanel.htmlnew file mode 100644index 0000000000..df6248fae8--- /dev/null+++ b/web/src/main/java/com/turbodev/server/web/component/sidebar/SidebarPanel.html@@ -0,0 +1,5 @@+<wicket:panel>+ <div wicket:id="head" class="head"></div>+ <ul wicket:id="tabs" class="tabs list-unstyled"></ul>+ <a wicket:id="miniToggle" class="mini-toggle"></a>+</wicket:panel>\ No newline at end of filediff --git a/web/src/main/java/com/turbodev/server/web/component/sidebar/SidebarPanel.java b/web/src/main/java/com/turbodev/server/web/component/sidebar/SidebarPanel.javanew file mode 100644index 0000000000..196b45ee84--- /dev/null+++ b/web/src/main/java/com/turbodev/server/web/component/sidebar/SidebarPanel.java@@ -0,0 +1,70 @@+package com.turbodev.server.web.component.sidebar;++import java.util.List;++import javax.annotation.Nullable;+import javax.servlet.http.Cookie;++import org.apache.wicket.Component;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.request.cycle.RequestCycle;+import org.apache.wicket.request.http.WebRequest;++import com.turbodev.server.web.component.tabbable.Tab;+import com.turbodev.server.web.component.tabbable.Tabbable;+import com.turbodev.server.web.util.WicketUtils;++@SuppressWarnings("serial")+public abstract class SidebarPanel extends Panel {++ private final String miniCookieKey;++ public SidebarPanel(String id, @Nullable String miniCookieKey) {+ super(id);+ this.miniCookieKey = miniCookieKey;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(newHead("head"));+ add(new Tabbable("tabs", newTabs()));+ add(new WebMarkupContainer("miniToggle").setVisible(miniCookieKey!=null));++ add(AttributeAppender.append("class", "sidebar"));++ if (miniCookieKey != null)+ add(AttributeAppender.append("class", "minimizable"));++ WebRequest request = (WebRequest) RequestCycle.get().getRequest();+ Cookie miniCookie = request.getCookie(miniCookieKey);+ if (miniCookie != null) {+ if ("yes".equals(miniCookie.getValue()))+ add(AttributeAppender.append("class", "minimized"));+ } else if (WicketUtils.isDevice()) {+ add(AttributeAppender.append("class", "minimized"));+ }+ }++ protected Component newHead(String componentId) {+ return new WebMarkupContainer(componentId).setVisible(false);+ }++ protected abstract List<? extends Tab> newTabs();++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(JavaScriptHeaderItem.forReference(new SidebarResourceReference()));+ String script = String.format("turbodev.server.sidebar.onDomReady('%s', %s);",+ getMarkupId(true), miniCookieKey!=null?"'"+miniCookieKey+"'":"undefined");+ response.render(OnDomReadyHeaderItem.forScript(script));+ }++}diff --git a/web/src/main/java/com/turbodev/server/web/component/sidebar/SidebarResourceReference.java b/web/src/main/java/com/turbodev/server/web/component/sidebar/SidebarResourceReference.javanew file mode 100644index 0000000000..d62739e473--- /dev/null+++ b/web/src/main/java/com/turbodev/server/web/component/sidebar/SidebarResourceReference.java@@ -0,0 +1,31 @@+package com.turbodev.server.web.component.sidebar;++import java.util.List;++import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.HeaderItem;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;++import com.turbodev.server.web.asset.cookies.CookiesResourceReference;+import com.turbodev.server.web.asset.perfectscrollbar.PerfectScrollbarResourceReference;+import com.turbodev.server.web.page.base.BaseDependentCssResourceReference;+import com.turbodev.server.web.page.base.BaseDependentResourceReference;++public class SidebarResourceReference extends BaseDependentResourceReference {++ private static final long serialVersionUID = 1L;++ public SidebarResourceReference() {+ super(SidebarResourceReference.class, "sidebar.js");+ }++ @Override+ public List<HeaderItem> getDependencies() {+ List<HeaderItem> dependencies = super.getDependencies();+ dependencies.add(JavaScriptHeaderItem.forReference(new CookiesResourceReference()));+ dependencies.add(JavaScriptHeaderItem.forReference(new PerfectScrollbarResourceReference()));+ dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(SidebarResourceReference.class, "sidebar.css")));+ return dependencies;+ }++}diff --git a/web/src/main/java/com/turbodev/server/web/component/sidebar/sidebar.css b/web/src/main/java/com/turbodev/server/web/component/sidebar/sidebar.cssnew file mode 100644index 0000000000..05b08293e1--- /dev/null+++ b/web/src/main/java/com/turbodev/server/web/component/sidebar/sidebar.css@@ -0,0 +1,86 @@+/* Side bar */+.sidebar {+ position: fixed;+ top: 0;+ left: 0;+ bottom: 0;+ background: #FAFAFA;+ overflow: hidden;+ width: 240px;+ border-left: 1px solid #FAFAFA;+ border-right: 2px solid #E0E0E0;+}+.sidebar>.tabs {+ position: absolute;+ left: 0;+ right: 0;+ top: 0;+ bottom: 0;+ padding: 20px 0;+ overflow: hidden;+ margin-bottom: 0;+}+.sidebar>.tabs>li>a {+ display: block;+ border-left: 4px solid #FAFAFA;+ padding: 8px;+ text-decoration: none;+ color: #616161;+ font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;+}+.sidebar>.tabs>li:hover>a {+ background: #EEE;+ border-left-color: #9E9E9E;+}+.sidebar>.tabs>li.active>a {+ background: #EEE;+ color: #212121;+ border-left-color: #212121;+ font-weight: bold;+}+.sidebar+.content {+ padding-left: 240px;+}++.minimizable.sidebar>.tabs {+ bottom: 36px;+}+.minimizable.sidebar>a.mini-toggle {+ display: block;+ border-top: 2px solid #E0E0E0;+ height: 36px;+ text-decoration: none;+ font-size: 24px;+ text-align: center;+ position: absolute;+ bottom: 0;+ left: 0;+ right: 0;+ color: #888;+ font-weight: bold;+ margin-right: 1px;+}+.minimizable.sidebar>a.mini-toggle .text {+ margin-left: 8px;+ font-size: 20px;+}+.minimizable.sidebar>a.mini-toggle:before {+ font-family: "FontAwesome";+ content: "\f100";+}+.minimizable.sidebar>a.mini-toggle:hover {+ background: #EEE;+}++.minimized.sidebar {+ width: 44px;+}+.minimized.sidebar>.tabs>li>a>.text {+ display: none;+}+.minimized.sidebar>a.mini-toggle:before {+ content: "\f101";+}+.minimized.sidebar+.content {+ padding-left: 44px;+}\ No newline at end of filediff --git a/web/src/main/java/com/turbodev/server/web/component/sidebar/sidebar.js b/web/src/main/java/com/turbodev/server/web/component/sidebar/sidebar.jsnew file mode 100644index 0000000000..4914757642--- /dev/null+++ b/web/src/main/java/com/turbodev/server/web/component/sidebar/sidebar.js@@ -0,0 +1,38 @@+turbodev.server.sidebar = {+ onDomReady: function(containerId, miniCookieKey) {+ var $sidebar = $("#"+containerId);+ var $tabs = $sidebar.children(".tabs");+ var $miniToggle = $sidebar.children(".mini-toggle");++ var ps = new PerfectScrollbar($tabs[0]);++ $(window).resize(function() {+ ps.update();+ });++ function onMiniToggled() {+ var $links = $sidebar.find("ul>li>a");+ if ($sidebar.hasClass("minimized")) {+ $links.each(function() {+ $(this).attr("title", $(this).find(".text").text());+ });+ $miniToggle.attr("title", "Expand");+ } else {+ $links.removeAttr("title");+ $miniToggle.attr("title", "Collapse");+ }+ }++ $miniToggle.click(function() {+ $sidebar.toggleClass("minimized");+ if (miniCookieKey) {+ var cookieValue = $sidebar.hasClass("minimized")?"yes":"no";+ Cookies.set(miniCookieKey, cookieValue, {expires: Infinity});+ }+ onMiniToggled();+ $(window).resize();+ });++ onMiniToggled();+ }+}\ No newline at end of filediff --git a/web/src/main/java/com/turbodev/server/web/img/Img.java b/web/src/main/java/com/turbodev/server/web/img/Img.javanew file mode 100644index 0000000000..b47e5f7d85--- /dev/null+++ b/web/src/main/java/com/turbodev/server/web/img/Img.java@@ -0,0 +1,5 @@+package com.turbodev.server.web.img;++public class Img {++}diff --git a/web/src/main/java/com/turbodev/server/web/assets/image/apple-touch-icon.png b/web/src/main/java/com/turbodev/server/web/img/apple-touch-icon.pngsimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/image/apple-touch-icon.pngrename to web/src/main/java/com/turbodev/server/web/img/apple-touch-icon.pngdiff --git a/web/src/main/java/com/turbodev/server/web/assets/favicon.ico b/web/src/main/java/com/turbodev/server/web/img/favicon.icosimilarity index 100%rename from web/src/main/java/com/turbodev/server/web/assets/favicon.icorename to web/src/main/java/com/turbodev/server/web/img/favicon.icodiff --git a/web/src/main/java/com/turbodev/server/web/page/admin/AdministrationPage.html b/web/src/main/java/com/turbodev/server/web/page/admin/AdministrationPage.htmlindex 5c5d25e90f..1d3bd98d78 100644--- a/web/src/main/java/com/turbodev/server/web/page/admin/AdministrationPage.html+++ b/web/src/main/java/com/turbodev/server/web/page/admin/AdministrationPage.html@@ -1,14 +1,8 @@<wicket:extend>- <div id="administration" class="sidebar">- <table>- <tr>- <td class="nav">- <ul wicket:id="tabs" class="tabs list-unstyled"></ul>- </td>- <td class="content">- <wicket:child></wicket:child>- </td>- </tr>- </table>+ <div id="administration">+ <div wicket:id="sidebar"></div>+ <div class="content">+ <wicket:child></wicket:child>+ </div></div></wicket:extend>\ No newline at end of filediff --git a/web/src/main/java/com/turbodev/server/web/page/admin/AdministrationPage.java b/web/src/main/java/com/turbodev/server/web/page/admin/AdministrationPage.javaindex e6aef2bd9d..7d1b2ad3be 100644--- a/web/src/main/java/com/turbodev/server/web/page/admin/AdministrationPage.java+++ b/web/src/main/java/com/turbodev/server/web/page/admin/AdministrationPage.java@@ -12,8 +12,9 @@ import org.apache.wicket.model.Model;import com.turbodev.server.security.SecurityUtils;import com.turbodev.server.web.ComponentRenderer;import com.turbodev.server.web.component.link.ViewStateAwarePageLink;+import com.turbodev.server.web.component.sidebar.SidebarPanel;import com.turbodev.server.web.component.tabbable.PageTab;-import com.turbodev.server.web.component.tabbable.Tabbable;+import com.turbodev.server.web.component.tabbable.Tab;import com.turbodev.server.web.page.admin.authenticator.AuthenticatorPage;import com.turbodev.server.web.page.admin.databasebackup.DatabaseBackupPage;import com.turbodev.server.web.page.admin.licensemanagement.LicenseManagementPage;@@ -36,17 +37,23 @@ public abstract class AdministrationPage extends LayoutPage {protected void onInitialize() {super.onInitialize();- List<PageTab> tabs = new ArrayList<>();- tabs.add(new AdministrationTab("System Setting", "fa fa-fw fa-sliders", SystemSettingPage.class));- tabs.add(new AdministrationTab("Security Setting", "fa fa-fw fa-lock", SecuritySettingPage.class));- tabs.add(new AdministrationTab("External Authentication", "fa fa-fw fa-key", AuthenticatorPage.class));- tabs.add(new AdministrationTab("Mail Setting", "fa fa-fw fa-envelope", MailSettingPage.class));- tabs.add(new AdministrationTab("Database Backup", "fa fa-fw fa-database", DatabaseBackupPage.class));- tabs.add(new AdministrationTab("Server Log", "fa fa-fw fa-file-text-o", ServerLogPage.class));- tabs.add(new AdministrationTab("Server Information", "fa fa-fw fa-desktop", ServerInformationPage.class));- tabs.add(new AdministrationTab("License Management", "fa fa-fw fa-vcard-o", LicenseManagementPage.class));-- add(new Tabbable("tabs", tabs));+ add(new SidebarPanel("sidebar", null) {++ @Override+ protected List<? extends Tab> newTabs() {+ List<PageTab> tabs = new ArrayList<>();+ tabs.add(new AdministrationTab("System Setting", "fa fa-fw fa-sliders", SystemSettingPage.class));+ tabs.add(new AdministrationTab("Security Setting", "fa fa-fw fa-lock", SecuritySettingPage.class));+ tabs.add(new AdministrationTab("External Authentication", "fa fa-fw fa-key", AuthenticatorPage.class));+ tabs.add(new AdministrationTab("Mail Setting", "fa fa-fw fa-envelope", MailSettingPage.class));+ tabs.add(new AdministrationTab("Database Backup", "fa fa-fw fa-database", DatabaseBackupPage.class));+ tabs.add(new AdministrationTab("Server Log", "fa fa-fw fa-file-text-o", ServerLogPage.class));+ tabs.add(new AdministrationTab("Server Information", "fa fa-fw fa-desktop", ServerInformationPage.class));+ tabs.add(new AdministrationTab("License Management", "fa fa-fw fa-vcard-o", LicenseManagementPage.class));+ return tabs;+ }++ });}@Overridediff --git a/web/src/main/java/com/turbodev/server/web/page/admin/AdministrationTabLink.html b/web/src/main/java/com/turbodev/server/web/page/admin/AdministrationTabLink.htmlindex 4686880dcd..f9086e7c60 100644--- a/web/src/main/java/com/turbodev/server/web/page/admin/AdministrationTabLink.html+++ b/web/src/main/java/com/turbodev/server/web/page/admin/AdministrationTabLink.html@@ -1,3 +1,3 @@<wicket:panel>- <a wicket:id="link"><span wicket:id="icon"></span> <span wicket:id="label"></span></a>+ <a wicket:id="link"><span wicket:id="icon"></span> <span wicket:id="label" class="text"></span></a></wicket:panel>\ No newline at end of filediff --git a/web/src/main/java/com/turbodev/server/web/page/admin/administration.css b/web/src/main/java/com/turbodev/server/web/page/admin/administration.cssindex 03da80d924..6ac77ca275 100644--- a/web/src/main/java/com/turbodev/server/web/page/admin/administration.css+++ b/web/src/main/java/com/turbodev/server/web/page/admin/administration.css@@ -1,9 +1,3 @@-#administration.sidebar>table>tbody>tr>td.nav a {- width: 240px;-}-#administration.sidebar>table>tbody>tr>td.content {- padding: 20px;-}.auto-backup {margin-bottom: 20px;}diff --git a/web/src/main/java/com/turbodev/server/web/page/base/BaseCssResourceReference.java b/web/src/main/java/com/turbodev/server/web/page/base/BaseCssResourceReference.javaindex 7e07999476..1b998a714d 100644--- a/web/src/main/java/com/turbodev/server/web/page/base/BaseCssResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/page/base/BaseCssResourceReference.java@@ -6,7 +6,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.request.resource.CssResourceReference;-import com.turbodev.server.web.page.base.fontext.FontExtResourceReference;+import com.turbodev.server.web.asset.fontext.FontExtResourceReference;import de.agilecoders.wicket.core.Bootstrap;@@ -22,7 +22,6 @@ public class BaseCssResourceReference extends CssResourceReference {public List<HeaderItem> getDependencies() {List<HeaderItem> dependencies = super.getDependencies();dependencies.add(CssHeaderItem.forReference(Bootstrap.getSettings().getCssResourceReference()));- dependencies.add(CssHeaderItem.forReference(new FontAwesomeResourceReference()));dependencies.add(CssHeaderItem.forReference(new FontExtResourceReference()));return dependencies;}diff --git a/web/src/main/java/com/turbodev/server/web/page/base/BasePage.html b/web/src/main/java/com/turbodev/server/web/page/base/BasePage.htmlindex 1d32ef80d4..8ba9582b4a 100644--- a/web/src/main/java/com/turbodev/server/web/page/base/BasePage.html+++ b/web/src/main/java/com/turbodev/server/web/page/base/BasePage.html@@ -8,9 +8,9 @@<meta name="Author" content="TurboDev Pty." /><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta wicket:id="robots" name="robots">- <link rel="icon" wicket:id="favicon" type="image/x-icon"/>- <link rel="apple-touch-icon" wicket:id="appleTouchIcon"/>- <link rel="apple-touch-icon-precomposed" wicket:id="appleTouchIconPrecomposed"/>+ <link rel="icon" href="/img/favicon.ico" type="image/x-icon"/>+ <link rel="apple-touch-icon" href="/img/apple-touch-icon.png"/>+ <link rel="apple-touch-icon-precomposed" href="/img/apple-touch-icon.png"/></head><body><wicket:child></wicket:child>diff --git a/web/src/main/java/com/turbodev/server/web/page/base/BasePage.java b/web/src/main/java/com/turbodev/server/web/page/base/BasePage.javaindex 0c603d875b..4fe0615c92 100644--- a/web/src/main/java/com/turbodev/server/web/page/base/BasePage.java+++ b/web/src/main/java/com/turbodev/server/web/page/base/BasePage.java@@ -35,7 +35,6 @@ import org.apache.wicket.protocol.ws.api.message.TextMessage;import org.apache.wicket.request.IRequestParameters;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.apache.wicket.request.resource.PackageResourceReference;import org.apache.wicket.util.time.Duration;import org.eclipse.jetty.servlet.ServletContextHandler;import org.unbescape.javascript.JavaScriptEscape;@@ -44,7 +43,6 @@ import com.turbodev.launcher.loader.AppLoader;import com.turbodev.server.TurboDev;import com.turbodev.server.manager.UserManager;import com.turbodev.server.model.User;-import com.turbodev.server.web.assets.Assets;import com.turbodev.server.web.behavior.AbstractPostAjaxBehavior;import com.turbodev.server.web.page.init.ServerInitPage;import com.turbodev.server.web.page.security.LoginPage;@@ -94,7 +92,8 @@ public abstract class BasePage extends WebPage {autosaveKeyToClear = "'" + JavaScriptEscape.escapeJavaScript(autosaveKeyToClear) + "'";elseautosaveKeyToClear = "undefined";- response.render(OnDomReadyHeaderItem.forScript(String.format("turbodev.server.onDomReady(%s);",+ response.render(OnDomReadyHeaderItem.forScript(+ String.format("turbodev.server.onDomReady(%s);",autosaveKeyToClear)));response.render(OnLoadHeaderItem.forScript("turbodev.server.onWindowLoad();"));}@@ -127,43 +126,6 @@ public abstract class BasePage extends WebPage {});- add(new WebMarkupContainer("favicon") {-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- CharSequence url = urlFor(- new PackageResourceReference(Assets.class, "favicon.ico"),- new PageParameters());- tag.put("href", url);- }-- });- add(new WebMarkupContainer("appleTouchIcon") {-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- CharSequence url = urlFor(- new PackageResourceReference(Assets.class, "image/apple-touch-icon.png"),- new PageParameters());- tag.put("href", url);- }-- });- add(new WebMarkupContainer("appleTouchIconPrecomposed") {-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- CharSequence url = urlFor(- new PackageResourceReference(Assets.class, "image/apple-touch-icon.png"),- new PageParameters());- tag.put("href", url);- }-- });-add(new AbstractPostAjaxBehavior() {@Overridediff --git a/web/src/main/java/com/turbodev/server/web/page/base/BaseResourceReference.java b/web/src/main/java/com/turbodev/server/web/page/base/BaseResourceReference.javaindex eac0b06973..5883ce82b8 100644--- a/web/src/main/java/com/turbodev/server/web/page/base/BaseResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/page/base/BaseResourceReference.java@@ -8,9 +8,11 @@ import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.request.resource.JavaScriptResourceReference;-import com.turbodev.server.web.assets.js.align.AlignResourceReference;-import com.turbodev.server.web.assets.js.areyousure.AreYouSureResourceReference;-import com.turbodev.server.web.assets.js.autosize.AutoSizeResourceReference;+import com.turbodev.server.web.asset.align.AlignResourceReference;+import com.turbodev.server.web.asset.areyousure.AreYouSureResourceReference;+import com.turbodev.server.web.asset.autosize.AutoSizeResourceReference;+import com.turbodev.server.web.asset.cookies.CookiesResourceReference;+import com.turbodev.server.web.asset.perfectscrollbar.PerfectScrollbarResourceReference;import de.agilecoders.wicket.core.Bootstrap;@@ -31,6 +33,9 @@ public class BaseResourceReference extends JavaScriptResourceReference {dependencies.add(JavaScriptHeaderItem.forReference(new AlignResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new AutoSizeResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new AreYouSureResourceReference()));+ dependencies.add(JavaScriptHeaderItem.forReference(new PerfectScrollbarResourceReference()));+ dependencies.add(JavaScriptHeaderItem.forReference(new CookiesResourceReference()));+dependencies.add(CssHeaderItem.forReference(new BaseCssResourceReference()));return dependencies;diff --git a/web/src/main/java/com/turbodev/server/web/page/base/FontAwesomeResourceReference.java b/web/src/main/java/com/turbodev/server/web/page/base/FontAwesomeResourceReference.javadeleted file mode 100644index ddb5f111ee..0000000000--- a/web/src/main/java/com/turbodev/server/web/page/base/FontAwesomeResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package com.turbodev.server.web.page.base;--import de.agilecoders.wicket.webjars.request.resource.WebjarsCssResourceReference;--public class FontAwesomeResourceReference extends WebjarsCssResourceReference {-- private static final long serialVersionUID = 1L;-- public FontAwesomeResourceReference() {- super("font-awesome/current/css/font-awesome.min.css");- }--}diff --git a/web/src/main/java/com/turbodev/server/web/page/base/base.css b/web/src/main/java/com/turbodev/server/web/page/base/base.cssindex 277c9527de..373488bda6 100644--- a/web/src/main/java/com/turbodev/server/web/page/base/base.css+++ b/web/src/main/java/com/turbodev/server/web/page/base/base.css@@ -1,13 +1,5 @@-html, body {- background: #F7F6F2;-}--/**************************************************************- * This file defines common css styles for TurboDev products.- *- **************************************************************/--html body {+body {+ min-width: 768px;font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";}@@ -138,7 +130,7 @@ form .form-group ul.feedbackPanel, form td.value ul.feedbackPanel {padding-bottom: 0;}form .form-group li.feedbackPanelERROR, form td.value li.feedbackPanelERROR {- color: #AA0000;+ color: #e51c23;list-style: disc;}form>.test-feedback {@@ -342,7 +334,8 @@ form>.test-feedback {.center-box {padding: 50px;- width: 600px;+ width: 50%;+ min-width: 300px;margin: 0 auto;background: white;border: 8px solid #DDD;diff --git a/web/src/main/java/com/turbodev/server/web/page/base/base.js b/web/src/main/java/com/turbodev/server/web/page/base/base.jsindex 31e60aa34e..ac4a258f28 100644--- a/web/src/main/java/com/turbodev/server/web/page/base/base.js+++ b/web/src/main/java/com/turbodev/server/web/page/base/base.js@@ -579,7 +579,7 @@ turbodev.server = {}},- onDomReady: function(autosaveKeyToClear) {+ onDomReady: function(autosaveKeyToClear, minWindowWidth) {turbodev.server.setupAjaxLoadingIndicator();turbodev.server.form.setupDirtyCheck();turbodev.server.focus.setupAutoFocus();diff --git a/web/src/main/java/com/turbodev/server/web/page/base/fontext/FontExtResourceReference.java b/web/src/main/java/com/turbodev/server/web/page/base/fontext/FontExtResourceReference.javadeleted file mode 100644index 2661c72508..0000000000--- a/web/src/main/java/com/turbodev/server/web/page/base/fontext/FontExtResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package com.turbodev.server.web.page.base.fontext;--import org.apache.wicket.request.resource.CssResourceReference;--public class FontExtResourceReference extends CssResourceReference {-- private static final long serialVersionUID = 1L;-- public FontExtResourceReference() {- super(FontExtResourceReference.class, "fontext.css");- }--}diff --git a/web/src/main/java/com/turbodev/server/web/page/group/GroupPage.html b/web/src/main/java/com/turbodev/server/web/page/group/GroupPage.htmlindex c33873282c..7c93591511 100644--- a/web/src/main/java/com/turbodev/server/web/page/group/GroupPage.html+++ b/web/src/main/java/com/turbodev/server/web/page/group/GroupPage.html@@ -1,14 +1,8 @@<wicket:extend>- <div id="group" class="sidebar">- <table>- <tr>- <td class="nav">- <ul wicket:id="groupTabs" class="tabs list-unstyled"></ul>- </td>- <td class="content">- <wicket:child></wicket:child>- </td>- </tr>- </table>+ <div id="group">+ <div wicket:id="sidebar"></div>+ <div class="content">+ <wicket:child></wicket:child>+ </div></div></wicket:extend>\ No newline at end of filediff --git a/web/src/main/java/com/turbodev/server/web/page/group/GroupPage.java b/web/src/main/java/com/turbodev/server/web/page/group/GroupPage.javaindex 25af85fd9c..fa4bf355f1 100644--- a/web/src/main/java/com/turbodev/server/web/page/group/GroupPage.java+++ b/web/src/main/java/com/turbodev/server/web/page/group/GroupPage.java@@ -4,6 +4,7 @@ import java.util.ArrayList;import java.util.List;import org.apache.wicket.Component;+import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;@@ -17,8 +18,9 @@ import com.turbodev.server.model.Group;import com.turbodev.server.security.SecurityUtils;import com.turbodev.server.web.ComponentRenderer;import com.turbodev.server.web.component.link.ViewStateAwarePageLink;+import com.turbodev.server.web.component.sidebar.SidebarPanel;import com.turbodev.server.web.component.tabbable.PageTab;-import com.turbodev.server.web.component.tabbable.Tabbable;+import com.turbodev.server.web.component.tabbable.Tab;import com.turbodev.server.web.page.layout.LayoutPage;import com.turbodev.server.web.util.model.EntityModel;@@ -42,14 +44,20 @@ public abstract class GroupPage extends LayoutPage {protected void onInitialize() {super.onInitialize();- List<PageTab> tabs = new ArrayList<>();-- tabs.add(new GroupTab("Profile", "fa fa-fw fa-list-alt", GroupProfilePage.class));- tabs.add(new GroupTab("Members", "fa fa-fw fa-user", GroupMembershipsPage.class));- if (SecurityUtils.isAdministrator() && !getGroup().isAdministrator())- tabs.add(new GroupTab("Authorized Projects", "fa fa-fw fa-ext fa-repo", GroupAuthorizationsPage.class));-- add(new Tabbable("groupTabs", tabs));+ add(new SidebarPanel("sidebar", null) {++ @Override+ protected List<? extends Tab> newTabs() {+ List<PageTab> tabs = new ArrayList<>();++ tabs.add(new GroupTab("Profile", "fa fa-fw fa-list-alt", GroupProfilePage.class));+ tabs.add(new GroupTab("Members", "fa fa-fw fa-user", GroupMembershipsPage.class));+ if (SecurityUtils.isAdministrator() && !getGroup().isAdministrator())+ tabs.add(new GroupTab("Authorized Projects", "fa fa-fw fa-ext fa-repo", GroupAuthorizationsPage.class));+ return tabs;+ }++ });}@Override@@ -104,7 +112,10 @@ public abstract class GroupPage extends LayoutPage {@Overridepublic Component render(String componentId) {- return new Label(componentId, getGroup().getName());+ Label label = new Label(componentId, getGroup().getName());+ label.add(AttributeAppender.append("class", "name"));+ label.add(AttributeAppender.append("title", getGroup().getName()));+ return label;}});diff --git a/web/src/main/java/com/turbodev/server/web/page/group/GroupTabLink.html b/web/src/main/java/com/turbodev/server/web/page/group/GroupTabLink.htmlindex 4686880dcd..f9086e7c60 100644--- a/web/src/main/java/com/turbodev/server/web/page/group/GroupTabLink.html+++ b/web/src/main/java/com/turbodev/server/web/page/group/GroupTabLink.html@@ -1,3 +1,3 @@<wicket:panel>- <a wicket:id="link"><span wicket:id="icon"></span> <span wicket:id="label"></span></a>+ <a wicket:id="link"><span wicket:id="icon"></span> <span wicket:id="label" class="text"></span></a></wicket:panel>\ No newline at end of filediff --git a/web/src/main/java/com/turbodev/server/web/page/group/group.css b/web/src/main/java/com/turbodev/server/web/page/group/group.cssindex dcce9d456a..fbb0b973aa 100644--- a/web/src/main/java/com/turbodev/server/web/page/group/group.css+++ b/web/src/main/java/com/turbodev/server/web/page/group/group.css@@ -9,9 +9,6 @@width: 240px;}-.group.list, .new-group {- padding: 20px;-}.group.list .actions a {color: #666;}diff --git a/web/src/main/java/com/turbodev/server/web/page/layout/LayoutPage.java b/web/src/main/java/com/turbodev/server/web/page/layout/LayoutPage.javaindex eef52fb07e..0f6b135f7d 100644--- a/web/src/main/java/com/turbodev/server/web/page/layout/LayoutPage.java+++ b/web/src/main/java/com/turbodev/server/web/page/layout/LayoutPage.java@@ -231,33 +231,17 @@ public abstract class LayoutPage extends BasePage {head.add(new WebMarkupContainer("userMenu").setVisible(false));}- add(new WebMarkupContainer("foot") {-- @Override- protected void onInitialize() {- super.onInitialize();- Plugin product = AppLoader.getProduct();- add(new Label("productVersion", product.getVersion()));- add(new Label("releaseDate", new SimpleDateFormat(RELEASE_DATE_FORMAT).format(product.getDate())));- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(isFootVisible());- }-- });+ WebMarkupContainer foot = new WebMarkupContainer("foot");+ Plugin product = AppLoader.getProduct();+ foot.add(new Label("productVersion", product.getVersion()));+ foot.add(new Label("releaseDate", new SimpleDateFormat(RELEASE_DATE_FORMAT).format(product.getDate())));+ add(foot);}protected List<ComponentRenderer> getBreadcrumbs() {return new ArrayList<>();};- protected boolean isFootVisible() {- return true;- }-@Overridepublic Collection<WebSocketRegion> getWebSocketRegions() {Collection<WebSocketRegion> regions = super.getWebSocketRegions();@@ -275,7 +259,6 @@ public abstract class LayoutPage extends BasePage {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);-response.render(CssHeaderItem.forReference(new LayoutResourceReference()));}diff --git a/web/src/main/java/com/turbodev/server/web/page/layout/LayoutResourceReference.java b/web/src/main/java/com/turbodev/server/web/page/layout/LayoutResourceReference.javaindex 20994e09af..7a4ba926fc 100644--- a/web/src/main/java/com/turbodev/server/web/page/layout/LayoutResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/page/layout/LayoutResourceReference.java@@ -1,8 +1,8 @@package com.turbodev.server.web.page.layout;-import org.apache.wicket.request.resource.CssResourceReference;+import com.turbodev.server.web.page.base.BaseDependentCssResourceReference;-public class LayoutResourceReference extends CssResourceReference {+public class LayoutResourceReference extends BaseDependentCssResourceReference {private static final long serialVersionUID = 1L;diff --git a/web/src/main/java/com/turbodev/server/web/page/layout/layout.css b/web/src/main/java/com/turbodev/server/web/page/layout/layout.cssindex 60a4065051..894c2bb55d 100644--- a/web/src/main/java/com/turbodev/server/web/page/layout/layout.css+++ b/web/src/main/java/com/turbodev/server/web/page/layout/layout.css@@ -1,17 +1,20 @@-html, body {- background: #F7F6F2;-}#layout>.head {- background: #010203;+ background: #212121;padding: 8px 16px;- color: #CCC;+ color: #E0E0E0;+ position: fixed;+ height: 48px;+ z-index: 200;+ left: 0;+ right: 0;+ min-width: 375px;}#layout>.head>div {margin-right: 20px;}#layout>.head a {text-decoration: none;- color: #CCC;+ color: #E0E0E0;}#layout>.head .push-disabled {padding-top: 6px;@@ -33,6 +36,31 @@ html, body {#layout>.head>.breadcrumb .separator {margin: 0 8px;}+#layout>.head>.breadcrumb .name {+ text-overflow: ellipsis;+ overflow: hidden;+ white-space: nowrap;+}+@media(min-width: 0px) {+ #layout>.head>.breadcrumb .name {+ max-width: 50px;+ }+}+@media(min-width: 500px) {+ #layout>.head>.breadcrumb .name {+ max-width: 100px;+ }+}+@media(min-width: 600px) {+ #layout>.head>.breadcrumb .name {+ max-width: 200px;+ }+}+@media(min-width: 900px) {+ #layout>.head>.breadcrumb .name {+ max-width: 400px;+ }+}#layout>.head>.help {padding-top: 7px;}@@ -66,55 +94,21 @@ html, body {width: 32px;height: 32px;}-#layout>.body {- border-bottom: 1px solid #BBB;- background: white;-}--.sidebar>table>tbody>tr>td.nav {- padding: 20px 0;- width: 1px;- border-right: 1px solid #DDD;-}-.sidebar>table>tbody>tr>td.nav>.tabs {- margin-bottom: 0;-}-.sidebar>table>tbody>tr>td.nav>.tabs>li>a {- color: #666;- display: block;- text-decoration: none;- padding: 12px;- padding-right: 8px;- white-space: nowrap;- border-right: 4px solid white;- width: 180px;- font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;- clear: both;- position: relative;-}-.sidebar>table>tbody>tr>td.nav>.tabs>li>a .fa {- font-size: 16px;- margin-right: 4px;-}-.sidebar>table>tbody>tr>td.nav>.tabs>li:hover>a {- color: #010203;- border-right-color: #777;-}-.sidebar>table>tbody>tr>td.nav>.tabs>li.active>a {- color: #010203;- border-right-color: #010203;- font-weight: bold;-}-.sidebar>table>tbody>tr>td.nav>.tabs>li>a .badge {- position: absolute;- right: 4px;- color: #888;- background: #EEE;+ padding: 68px 20px 56px 20px;+ width: 100%;}#layout>.foot {+ border-top: 2px solid #E0E0E0;+ position: fixed;+ bottom: 0;+ left: 0;+ right: 0;+ height: 36px;+ background: #F5F5F5;font-size: 11px;padding: 8px;+ z-index: 210;}#layout>.foot>div {white-space: nowrap;@@ -136,3 +130,8 @@ html, body {.floating>.content>.user a:hover {background: #F2F2F2;}++#layout .sidebar {+ top: 48px;+ bottom: 36px;+}diff --git a/web/src/main/java/com/turbodev/server/web/page/project/ProjectPage.html b/web/src/main/java/com/turbodev/server/web/page/project/ProjectPage.htmlindex a83eba5eea..8ff71eb08f 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/ProjectPage.html+++ b/web/src/main/java/com/turbodev/server/web/page/project/ProjectPage.html@@ -1,22 +1,13 @@<wicket:extend><div id="project">- <div class="sidebar">- <table>- <tr>- <td wicket:id="sidebar" class="nav">- <a class="mini-toggle"><span></span></a>- <ul wicket:id="projectTabs" class="tabs list-unstyled"></ul>- </td>- <td class="content">- <wicket:child></wicket:child>- </td>- </tr>- </table>+ <div wicket:id="sidebar"></div>+ <div class="content">+ <wicket:child></wicket:child></div></div><wicket:fragment wicket:id="breadcrumbFrag"><div class="project clearfix">- <a wicket:id="name" class="pull-left"></a>+ <a wicket:id="name" class="pull-left name"></a><a wicket:id="moreInfo" class="pull-left more-info"><i class="fa fa-ellipsis-h"></i></a></div></wicket:fragment>diff --git a/web/src/main/java/com/turbodev/server/web/page/project/ProjectPage.java b/web/src/main/java/com/turbodev/server/web/page/project/ProjectPage.javaindex fd265ad592..4a64791d15 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/ProjectPage.java+++ b/web/src/main/java/com/turbodev/server/web/page/project/ProjectPage.java@@ -6,24 +6,19 @@ import java.util.List;import java.util.Map;import javax.persistence.EntityNotFoundException;-import javax.servlet.http.Cookie;import org.apache.wicket.Component;import org.apache.wicket.RestartResponseException;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.ComponentTag;+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.OnDomReadyHeaderItem;-import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;-import org.apache.wicket.request.cycle.RequestCycle;-import org.apache.wicket.request.http.WebRequest;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.lib.ObjectId;@@ -37,8 +32,9 @@ import com.turbodev.server.web.ComponentRenderer;import com.turbodev.server.web.component.floating.FloatingPanel;import com.turbodev.server.web.component.link.DropdownLink;import com.turbodev.server.web.component.link.ViewStateAwarePageLink;+import com.turbodev.server.web.component.sidebar.SidebarPanel;import com.turbodev.server.web.component.tabbable.PageTab;-import com.turbodev.server.web.component.tabbable.Tabbable;+import com.turbodev.server.web.component.tabbable.Tab;import com.turbodev.server.web.page.layout.LayoutPage;import com.turbodev.server.web.page.project.blob.ProjectBlobPage;import com.turbodev.server.web.page.project.branches.ProjectBranchesPage;@@ -59,7 +55,7 @@ import com.turbodev.server.web.page.project.tags.ProjectTagsPage;public abstract class ProjectPage extends LayoutPage {private static final String PARAM_PROJECT = "project";-+protected final IModel<Project> projectModel;public static PageParameters paramsOf(Project project) {@@ -123,53 +119,46 @@ public abstract class ProjectPage extends LayoutPage {@Overrideprotected void onInitialize() {super.onInitialize();-- List<PageTab> tabs = new ArrayList<>();- tabs.add(new ProjectTab(Model.of("Files"), "fa fa-fw fa-file-text-o", 0, ProjectBlobPage.class));- tabs.add(new ProjectTab(Model.of("Commits"), "fa fa-fw fa-ext fa-commit", 0,- ProjectCommitsPage.class, CommitDetailPage.class));- tabs.add(new ProjectTab(Model.of("Branches"), "fa fa-fw fa-code-fork",- 0, ProjectBranchesPage.class));- tabs.add(new ProjectTab(Model.of("Tags"), "fa fa-fw fa-tag",- 0, ProjectTagsPage.class));-- tabs.add(new ProjectTab(Model.of("Pull Requests"), "fa fa-fw fa-ext fa-branch-compare",- 0, RequestListPage.class, NewRequestPage.class, RequestDetailPage.class, InvalidRequestPage.class));-- tabs.add(new ProjectTab(Model.of("Code Comments"), "fa fa-fw fa-comments",- 0, ProjectCodeCommentsPage.class));-- tabs.add(new ProjectTab(Model.of("Compare"), "fa fa-fw fa-ext fa-file-diff", 0, RevisionComparePage.class));-- /*- tabs.add(new ProjectTab(Model.of("Statistics"), "fa fa-fw fa-bar-chart", 0, ProjectContribsPage.class,- ProjectStatsPage.class));- */-- if (SecurityUtils.canManage(getProject()))- tabs.add(new ProjectTab(Model.of("Setting"), "fa fa-fw fa-cog", 0, GeneralSettingPage.class, ProjectSettingPage.class));-- WebMarkupContainer sidebar = new WebMarkupContainer("sidebar");- add(sidebar);-- /*- * Add mini class here instead of project.js as we want the sidebar to- * be minimized initially even if the page takes some time to load- */- WebRequest request = (WebRequest) RequestCycle.get().getRequest();- Cookie cookie = request.getCookie("project.miniSidebar");- if (cookie != null && "yes".equals(cookie.getValue()))- sidebar.add(AttributeAppender.append("class", " mini"));-- sidebar.add(new Tabbable("projectTabs", tabs));++ add(new SidebarPanel("sidebar", "project.miniSidebar") {++ @Override+ protected List<? extends Tab> newTabs() {+ List<PageTab> tabs = new ArrayList<>();+ tabs.add(new ProjectTab(Model.of("Files"), "fa fa-fw fa-file-text-o", 0, ProjectBlobPage.class));+ tabs.add(new ProjectTab(Model.of("Commits"), "fa fa-fw fa-ext fa-commit", 0,+ ProjectCommitsPage.class, CommitDetailPage.class));+ tabs.add(new ProjectTab(Model.of("Branches"), "fa fa-fw fa-code-fork",+ 0, ProjectBranchesPage.class));+ tabs.add(new ProjectTab(Model.of("Tags"), "fa fa-fw fa-tag",+ 0, ProjectTagsPage.class));++ tabs.add(new ProjectTab(Model.of("Pull Requests"), "fa fa-fw fa-ext fa-branch-compare",+ 0, RequestListPage.class, NewRequestPage.class, RequestDetailPage.class, InvalidRequestPage.class));++ tabs.add(new ProjectTab(Model.of("Code Comments"), "fa fa-fw fa-comments",+ 0, ProjectCodeCommentsPage.class));++ tabs.add(new ProjectTab(Model.of("Compare"), "fa fa-fw fa-ext fa-file-diff", 0, RevisionComparePage.class));++ /*+ tabs.add(new ProjectTab(Model.of("Statistics"), "fa fa-fw fa-bar-chart", 0, ProjectContribsPage.class,+ ProjectStatsPage.class));+ */++ if (SecurityUtils.canManage(getProject()))+ tabs.add(new ProjectTab(Model.of("Setting"), "fa fa-fw fa-cog", 0, GeneralSettingPage.class, ProjectSettingPage.class));++ return tabs;+ }+ });}@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(JavaScriptHeaderItem.forReference(new ProjectResourceReference()));- response.render(OnDomReadyHeaderItem.forScript("turbodev.server.project();"));+ response.render(CssHeaderItem.forReference(new ProjectResourceReference()));}@Override@@ -228,7 +217,8 @@ public abstract class ProjectPage extends LayoutPage {return Model.of(getProject().getName());}- });+ }.add(AttributeAppender.append("title", getProject().getName())));+fragment.add(new DropdownLink("moreInfo") {@Overridediff --git a/web/src/main/java/com/turbodev/server/web/page/project/ProjectResourceReference.java b/web/src/main/java/com/turbodev/server/web/page/project/ProjectResourceReference.javaindex 8f607dc4d0..c0c490d903 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/ProjectResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/page/project/ProjectResourceReference.java@@ -1,29 +1,13 @@package com.turbodev.server.web.page.project;-import java.util.List;+import com.turbodev.server.web.page.base.BaseDependentCssResourceReference;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.HeaderItem;-import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import org.apache.wicket.request.resource.CssResourceReference;--import com.turbodev.server.web.assets.js.cookies.CookiesResourceReference;-import com.turbodev.server.web.page.base.BaseDependentResourceReference;--public class ProjectResourceReference extends BaseDependentResourceReference {+public class ProjectResourceReference extends BaseDependentCssResourceReference {private static final long serialVersionUID = 1L;public ProjectResourceReference() {- super(ProjectResourceReference.class, "project.js");- }-- @Override- public List<HeaderItem> getDependencies() {- List<HeaderItem> dependencies = super.getDependencies();- dependencies.add(JavaScriptHeaderItem.forReference(new CookiesResourceReference()));- dependencies.add(CssHeaderItem.forReference(new CssResourceReference(ProjectResourceReference.class, "project.css")));- return dependencies;+ super(ProjectResourceReference.class, "project.css");}}diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/ProjectBlobPage.html b/web/src/main/java/com/turbodev/server/web/page/project/blob/ProjectBlobPage.htmlindex bc500b6df6..9041965b76 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/ProjectBlobPage.html+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/ProjectBlobPage.html@@ -3,7 +3,7 @@<div class="head clearfix"><a wicket:id="revisionPicker" class="revision-picker pull-left"></a><div wicket:id="blobNavigator" class="blob-navigator pull-left"></div>- <div wicket:id="blobOperations" class="operations">+ <div wicket:id="blobOperations" class="operations pull-right"><a wicket:id="history" title="Commit history of current path">History</a><a wicket:id="add" title="Add files to current directory">Add <i class="fa fa-caret-down"></i></a><a wicket:id="download" title="Download code archive of whole project at this revision">Download <i class="fa fa-caret-down"></i></a>diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/ProjectBlobPage.java b/web/src/main/java/com/turbodev/server/web/page/project/blob/ProjectBlobPage.javaindex 81e776f2b0..13a2c61196 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/ProjectBlobPage.java+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/ProjectBlobPage.java@@ -44,11 +44,11 @@ import org.eclipse.jgit.revwalk.RevTree;import org.eclipse.jgit.revwalk.RevWalk;import org.eclipse.jgit.treewalk.TreeWalk;+import com.google.common.base.Objects;+import com.google.common.base.Preconditions;import com.turbodev.jsymbol.TokenPosition;import com.turbodev.jsymbol.util.NoAntiCacheImage;import com.turbodev.launcher.loader.ListenerRegistry;-import com.google.common.base.Objects;-import com.google.common.base.Preconditions;import com.turbodev.server.TurboDev;import com.turbodev.server.event.RefUpdated;import com.turbodev.server.git.BlobIdent;@@ -903,11 +903,6 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {return getProject().getRevCommit(resolvedRevision);}- @Override- protected boolean isFootVisible() {- return false;- }-@Overridepublic Collection<WebSocketRegion> getWebSocketRegions() {Collection<WebSocketRegion> regions = super.getWebSocketRegions();diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/ProjectBlobResourceReference.java b/web/src/main/java/com/turbodev/server/web/page/project/blob/ProjectBlobResourceReference.javaindex d28274908a..ed267b9fa4 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/ProjectBlobResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/ProjectBlobResourceReference.java@@ -6,9 +6,9 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import com.turbodev.server.web.assets.js.cookies.CookiesResourceReference;-import com.turbodev.server.web.assets.js.hotkeys.HotkeysResourceReference;-import com.turbodev.server.web.assets.js.jqueryui.JQueryUIResourceReference;+import com.turbodev.server.web.asset.cookies.CookiesResourceReference;+import com.turbodev.server.web.asset.hotkeys.HotkeysResourceReference;+import com.turbodev.server.web.asset.jqueryui.JQueryUIResourceReference;import com.turbodev.server.web.page.base.BaseDependentCssResourceReference;import com.turbodev.server.web.page.base.BaseDependentResourceReference;diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/project-blob.css b/web/src/main/java/com/turbodev/server/web/page/project/blob/project-blob.cssindex 42611175b1..b389b76b4d 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/project-blob.css+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/project-blob.css@@ -1,21 +1,26 @@+#project-blob {+ margin: -20px;+}#project-blob>.head {- border-bottom: 1px solid #BBB;+ border-bottom: 1px solid #E0E0E0;height: 31px;}+#project-blob>.head>.revision-picker {padding: 0;+ border-right: 1px solid #E0E0E0;}#project-blob>.head>.comment-context {- border-right: 1px solid #BBB;+ border-right: 1px solid #E0E0E0;padding: 5px 8px 0 8px;height: 31px;cursor: pointer;}#project-blob>.head>a.revision-picker {display: block;- border-right: 1px solid #BBB;color: #333;text-decoration: none;+ white-space: nowrap;}#project-blob>.head>a.revision-picker:hover {background: #EEE;@@ -29,7 +34,7 @@}#project-blob>.head>.blob-navigator form.name input {height: 30px;- border: 1px solid #BBB;+ border: 1px solid #E0E0E0;border-top: none;border-bottom: none;border-radius: 0;@@ -38,11 +43,11 @@width: 160px;}#project-blob>.blob-navigator {- border-bottom: 1px solid #BBB;+ border-bottom: 1px solid #E0E0E0;}#project-blob>.blob-navigator form.name input {- border-top: 1px solid #BBB;- border-bottom: 1px solid #BBB;+ border-top: 1px solid #E0E0E0;+ border-bottom: 1px solid #E0E0E0;height: 26px;margin-top: -1px;border-radius: 3px;@@ -51,8 +56,6 @@#project-blob>.head>.operations {margin-top: 4px;- position: absolute;- right: 0;}#project-blob>.head>.operations>a {padding: 4px 8px;diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/project-blob.js b/web/src/main/java/com/turbodev/server/web/page/project/blob/project-blob.jsindex e264525a88..42d02b4566 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/project-blob.js+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/project-blob.js@@ -54,9 +54,23 @@ turbodev.server.projectBlob = {}var $blobContent = $("#project-blob>.blob-content");- var width = $(window).width()-$blobContent.offset().left;- var height = turbodev.server.projectBlob.getClientHeight();+ var minWindowWidth = turbodev.server.projectBlob.parseCssDimension($("body").css("min-width"));++ var windowWidth = $(window).width();+ if (windowWidth < minWindowWidth) {+ windowWidth = minWindowWidth;+ $("body").css("overflow-x", "visible");+ } else {+ $("body").css("overflow-x", "hidden");+ }+ var width = windowWidth-$blobContent.offset().left;++ var height = $(window).height()-$blobContent.offset().top;++ if ($("#layout>.foot").length != 0)+ height -= $("#layout>.foot").outerHeight();+var $searchResult = $("#project-blob>.search-result");if ($searchResult.is(":visible")) {var $searchResultHead = $searchResult.find(".search-result>.head");@@ -87,11 +101,13 @@ turbodev.server.projectBlob = {});},- getClientHeight: function() {- var height = $(window).height()-$("#project-blob>.blob-content").offset().top;- if ($("#main>.foot").length != 0)- height -= $("#main>.foot").outerHeight();- return height;+ parseCssDimension: function(cssDimension) {+ var index = cssDimension.indexOf("px");+ if (index && index != -1) {+ return parseInt(cssDimension.substring(0, index));+ } else {+ return 0;+ }},onWindowLoad: function() {if (location.hash && !turbodev.server.viewState.getFromHistory()) {diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/edit/BlobEditResourceReference.java b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/edit/BlobEditResourceReference.javaindex f6f50d7ce7..612bc843c7 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/edit/BlobEditResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/edit/BlobEditResourceReference.java@@ -7,7 +7,7 @@ import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.request.resource.CssResourceReference;-import com.turbodev.server.web.assets.js.codemirror.CodeMirrorResourceReference;+import com.turbodev.server.web.asset.codemirror.CodeMirrorResourceReference;import com.turbodev.server.web.page.base.BaseDependentResourceReference;public class BlobEditResourceReference extends BaseDependentResourceReference {diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceEditResourceReference.java b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceEditResourceReference.javaindex de969e3b55..7f13eca6bf 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceEditResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceEditResourceReference.java@@ -6,10 +6,10 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import com.turbodev.server.web.assets.js.codemirror.CodeMirrorResourceReference;-import com.turbodev.server.web.assets.js.cookies.CookiesResourceReference;-import com.turbodev.server.web.assets.js.diffmatchpatch.DiffMatchPatchResourceReference;-import com.turbodev.server.web.assets.js.jqueryui.JQueryUIResourceReference;+import com.turbodev.server.web.asset.codemirror.CodeMirrorResourceReference;+import com.turbodev.server.web.asset.cookies.CookiesResourceReference;+import com.turbodev.server.web.asset.diffmatchpatch.DiffMatchPatchResourceReference;+import com.turbodev.server.web.asset.jqueryui.JQueryUIResourceReference;import com.turbodev.server.web.page.base.BaseDependentCssResourceReference;import com.turbodev.server.web.page.base.BaseDependentResourceReference;diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.javaindex a6355edc88..3bd07e1892 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java@@ -53,15 +53,11 @@ import org.unbescape.javascript.JavaScriptEscape;import com.fasterxml.jackson.core.JsonProcessingException;import com.fasterxml.jackson.databind.ObjectMapper;-import com.turbodev.utils.Range;-import com.turbodev.utils.StringUtils;-import com.turbodev.utils.matchscore.MatchScoreProvider;-import com.turbodev.utils.matchscore.MatchScoreUtils;+import com.google.common.base.Preconditions;import com.turbodev.jsymbol.Symbol;import com.turbodev.jsymbol.SymbolExtractor;import com.turbodev.jsymbol.SymbolExtractorRegistry;import com.turbodev.jsymbol.TokenPosition;-import com.google.common.base.Preconditions;import com.turbodev.server.TurboDev;import com.turbodev.server.git.BlameBlock;import com.turbodev.server.git.Blob;@@ -103,8 +99,13 @@ import com.turbodev.server.web.page.project.blob.search.SearchMenuContributor;import com.turbodev.server.web.page.project.commit.CommitDetailPage;import com.turbodev.server.web.page.project.compare.RevisionComparePage;import com.turbodev.server.web.util.DateUtils;+import com.turbodev.server.web.util.WicketUtils;import com.turbodev.server.web.util.ajaxlistener.ConfirmLeaveListener;import com.turbodev.server.web.websocket.PageDataChanged;+import com.turbodev.utils.Range;+import com.turbodev.utils.StringUtils;+import com.turbodev.utils.matchscore.MatchScoreProvider;+import com.turbodev.utils.matchscore.MatchScoreUtils;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;@@ -746,7 +747,11 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMeif (hasOutline()) {WebRequest request = (WebRequest) RequestCycle.get().getRequest();Cookie cookie = request.getCookie(COOKIE_OUTLINE);- return cookie==null || !cookie.getValue().equals("no");+ if (cookie != null) {+ return cookie.getValue().equals("yes");+ } else {+ return !WicketUtils.isDevice();+ }} else {return false;}diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceViewResourceReference.java b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceViewResourceReference.javaindex 5f605a4287..748f629017 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceViewResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceViewResourceReference.java@@ -6,15 +6,15 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import com.turbodev.server.web.assets.js.clipboard.ClipboardResourceReference;-import com.turbodev.server.web.assets.js.codemirror.CodeMirrorResourceReference;-import com.turbodev.server.web.assets.js.cookies.CookiesResourceReference;-import com.turbodev.server.web.assets.js.doneevents.DoneEventsResourceReference;-import com.turbodev.server.web.assets.js.hotkeys.HotkeysResourceReference;-import com.turbodev.server.web.assets.js.hover.HoverResourceReference;-import com.turbodev.server.web.assets.js.jqueryui.JQueryUIResourceReference;-import com.turbodev.server.web.assets.js.scrollintoview.ScrollIntoViewResourceReference;-import com.turbodev.server.web.assets.js.selectionpopover.SelectionPopoverResourceReference;+import com.turbodev.server.web.asset.clipboard.ClipboardResourceReference;+import com.turbodev.server.web.asset.codemirror.CodeMirrorResourceReference;+import com.turbodev.server.web.asset.cookies.CookiesResourceReference;+import com.turbodev.server.web.asset.doneevents.DoneEventsResourceReference;+import com.turbodev.server.web.asset.hotkeys.HotkeysResourceReference;+import com.turbodev.server.web.asset.hover.HoverResourceReference;+import com.turbodev.server.web.asset.jqueryui.JQueryUIResourceReference;+import com.turbodev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference;+import com.turbodev.server.web.asset.selectionpopover.SelectionPopoverResourceReference;import com.turbodev.server.web.page.base.BaseDependentCssResourceReference;import com.turbodev.server.web.page.base.BaseDependentResourceReference;diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/source-view.css b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/source-view.cssindex 17be3f1ed8..2424e794c1 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/source-view.css+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/source-view.css@@ -5,7 +5,6 @@background: white;position: absolute;padding-right: 4px;- border-left: 3px solid #F2F2F2;top: 0;left: 0;}@@ -28,7 +27,7 @@}.source-view>.comment>.ui-resizable-handle {position: absolute;- border-right: 1px solid #CCC;+ border-right: 1px solid #E0E0E0;background: #EEE url(vgrabber.png) no-repeat scroll right center;cursor: e-resize;width: 4px;@@ -56,7 +55,7 @@}.source-view>.outline>.ui-resizable-handle {position: absolute;- border-left: 1px solid #CCC;+ border-left: 1px solid #E0E0E0;background: #EEE url(vgrabber.png) no-repeat scroll left center;cursor: w-resize;width: 4px;diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/source-view.js b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/source-view.jsindex a67ecc5e12..9e6fd8d81c 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/source-view.js+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/source-view.js@@ -192,7 +192,7 @@ turbodev.server.sourceView = {var $comment = $sourceView.children(".comment");var commentWidth = Cookies.get(commentWidthCookieKey);if (!commentWidth)- commentWidth = 400;+ commentWidth = $sourceView.outerWidth()/3;$comment.outerWidth(commentWidth);var $commentResizeHandle = $comment.children(".ui-resizable-handle");$comment.resizable({diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/view/blob-view.css b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/view/blob-view.cssindex 93fdf8b14c..b413e87bb7 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/view/blob-view.css+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/render/view/blob-view.css@@ -1,5 +1,5 @@.blob-view>.head {- border-bottom: 1px solid #BBB;+ border-bottom: 1px solid #E0E0E0;padding: 4px 8px;}.blob-view>.body {@@ -9,7 +9,7 @@color: #666;}.blob-view>.head>.info .separator {- color: #BBB;+ color: #E0E0E0;}.blob-view>.head .actions {white-space: nowrap;diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/search/quick/QuickSearchResourceReference.java b/web/src/main/java/com/turbodev/server/web/page/project/blob/search/quick/QuickSearchResourceReference.javaindex 356a3e386e..0bd4b0755b 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/search/quick/QuickSearchResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/search/quick/QuickSearchResourceReference.java@@ -6,9 +6,9 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;-import com.turbodev.server.web.assets.js.doneevents.DoneEventsResourceReference;-import com.turbodev.server.web.assets.js.hotkeys.HotkeysResourceReference;-import com.turbodev.server.web.assets.js.scrollintoview.ScrollIntoViewResourceReference;+import com.turbodev.server.web.asset.doneevents.DoneEventsResourceReference;+import com.turbodev.server.web.asset.hotkeys.HotkeysResourceReference;+import com.turbodev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference;import com.turbodev.server.web.page.base.BaseDependentCssResourceReference;import com.turbodev.server.web.page.base.BaseDependentResourceReference;diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/search/result/SearchResultResourceReference.java b/web/src/main/java/com/turbodev/server/web/page/project/blob/search/result/SearchResultResourceReference.javaindex d2b9300ade..ae39b65bab 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/blob/search/result/SearchResultResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/page/project/blob/search/result/SearchResultResourceReference.java@@ -7,7 +7,7 @@ import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.request.resource.CssResourceReference;-import com.turbodev.server.web.assets.js.uri.URIResourceReference;+import com.turbodev.server.web.asset.uri.URIResourceReference;import com.turbodev.server.web.page.base.BaseDependentResourceReference;public class SearchResultResourceReference extends BaseDependentResourceReference {diff --git a/web/src/main/java/com/turbodev/server/web/page/project/branches/project-branches.css b/web/src/main/java/com/turbodev/server/web/page/project/branches/project-branches.cssindex 0b3fe0a7a8..26a78d9d97 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/branches/project-branches.css+++ b/web/src/main/java/com/turbodev/server/web/page/project/branches/project-branches.css@@ -1,7 +1,3 @@-#project-branches {- padding: 20px;-}-#project-branches>.list>.head>.base {width: 240px;}diff --git a/web/src/main/java/com/turbodev/server/web/page/project/comments/project-code-comments.css b/web/src/main/java/com/turbodev/server/web/page/project/comments/project-code-comments.cssindex aefacfb9d9..e69de29bb2 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/comments/project-code-comments.css+++ b/web/src/main/java/com/turbodev/server/web/page/project/comments/project-code-comments.css@@ -1,3 +0,0 @@-#project-code-comments {- padding: 20px;-}diff --git a/web/src/main/java/com/turbodev/server/web/page/project/commit/CommitDetailResourceReference.java b/web/src/main/java/com/turbodev/server/web/page/project/commit/CommitDetailResourceReference.javaindex 6a9bdd03c1..436c365839 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/commit/CommitDetailResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/page/project/commit/CommitDetailResourceReference.java@@ -7,7 +7,7 @@ import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.request.resource.CssResourceReference;-import com.turbodev.server.web.assets.js.oneline.OnelineResourceReference;+import com.turbodev.server.web.asset.oneline.OnelineResourceReference;import com.turbodev.server.web.page.base.BaseDependentResourceReference;public class CommitDetailResourceReference extends BaseDependentResourceReference {diff --git a/web/src/main/java/com/turbodev/server/web/page/project/commit/commit-detail.css b/web/src/main/java/com/turbodev/server/web/page/project/commit/commit-detail.cssindex d475ad0cd1..15e79e9cd0 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/commit/commit-detail.css+++ b/web/src/main/java/com/turbodev/server/web/page/project/commit/commit-detail.css@@ -1,6 +1,3 @@-#commit-detail {- padding: 20px;-}#commit-detail>div {margin-bottom: 16px;}diff --git a/web/src/main/java/com/turbodev/server/web/page/project/commit/project-commits.css b/web/src/main/java/com/turbodev/server/web/page/project/commit/project-commits.cssindex 2b1e2eb589..2d95f24748 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/commit/project-commits.css+++ b/web/src/main/java/com/turbodev/server/web/page/project/commit/project-commits.css@@ -1,11 +1,9 @@#repo-commits {position: relative;- padding: 20px;}#repo-commits>.head>.query {margin-bottom: 20px;}-#repo-commits>.body .no-commits {font-size: 16px;}diff --git a/web/src/main/java/com/turbodev/server/web/page/project/compare/RevisionComparePage.html b/web/src/main/java/com/turbodev/server/web/page/project/compare/RevisionComparePage.htmlindex 801da0c7c0..eb3996a995 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/compare/RevisionComparePage.html+++ b/web/src/main/java/com/turbodev/server/web/page/project/compare/RevisionComparePage.html@@ -1,50 +1,47 @@<wicket:extend><div id="revision-compare">- <div class="head">Compare Revisions</div>- <div class="body">- <table class="revisions">- <tr>- <td class="left revision">- <div class="title clearfix">- <label class="pull-left">Left side</label>- <wicket:enclosure child="compareWithMergeBase">- <input wicket:id="compareWithMergeBase" type="checkbox" class="pull-left"></input>- <span class="pull-left">common ancestor</span>- <a wicket:id="mergeBaseTooltip" class="pull-left"><i class="fa fa-question-circle"></i></a>- </wicket:enclosure>- </div>- <div wicket:id="leftRevSelector" class="selector"></div>- <div class="message">- <a wicket:id="leftCommitLink"><span wicket:id="message"></span></a>- </div>- </td>- <td class="action">- <a wicket:id="swap" class="swap btn btn-default" title="Swap"><i class="fa fa-exchange"></i></a>- </td>- <td class="right revision">- <div class="title">- <label>Right side</label>- </div>- <div wicket:id="rightRevSelector" class="selector"></div>- <div class="message">- <a wicket:id="rightCommitLink"><span wicket:id="message"></span></a>- </div>- </td>- </tr>- </table>- <div wicket:id="effectiveRequest" class="alert alert-info">- <div wicket:id="description"></div>- <b><a wicket:id="link"><span wicket:id="label"></span></a></b>- </div>- <div>- <a wicket:id="createRequest" class="btn btn-primary">Create Pull Request</a>- </div>- <div wicket:id="unrelatedHistory" class="alert alert-danger">- <span class="fa fa-lg fa-warning"></span>- <span>History of left side and right side is unrelated.</span>- </div>- <ul wicket:id="tabs" class="nav nav-tabs"></ul>- <div wicket:id="tabPanel" class="tab-panel"></div>+ <table class="revisions">+ <tr>+ <td class="left revision">+ <div class="title clearfix">+ <label class="pull-left">Left side</label>+ <wicket:enclosure child="compareWithMergeBase">+ <input wicket:id="compareWithMergeBase" type="checkbox" class="pull-left"></input>+ <span class="pull-left">common ancestor</span>+ <a wicket:id="mergeBaseTooltip" class="pull-left"><i class="fa fa-question-circle"></i></a>+ </wicket:enclosure>+ </div>+ <div wicket:id="leftRevSelector" class="selector"></div>+ <div class="message">+ <a wicket:id="leftCommitLink"><span wicket:id="message"></span></a>+ </div>+ </td>+ <td class="action">+ <a wicket:id="swap" class="swap btn btn-default" title="Swap"><i class="fa fa-exchange"></i></a>+ </td>+ <td class="right revision">+ <div class="title">+ <label>Right side</label>+ </div>+ <div wicket:id="rightRevSelector" class="selector"></div>+ <div class="message">+ <a wicket:id="rightCommitLink"><span wicket:id="message"></span></a>+ </div>+ </td>+ </tr>+ </table>+ <div wicket:id="effectiveRequest" class="alert alert-info">+ <div wicket:id="description"></div>+ <b><a wicket:id="link"><span wicket:id="label"></span></a></b></div>+ <div>+ <a wicket:id="createRequest" class="btn btn-primary">Create Pull Request</a>+ </div>+ <div wicket:id="unrelatedHistory" class="alert alert-danger">+ <span class="fa fa-lg fa-warning"></span>+ <span>History of left side and right side is unrelated.</span>+ </div>+ <ul wicket:id="tabs" class="nav nav-tabs"></ul>+ <div wicket:id="tabPanel" class="tab-panel"></div></div></wicket:extend>\ No newline at end of filediff --git a/web/src/main/java/com/turbodev/server/web/page/project/compare/revision-compare.css b/web/src/main/java/com/turbodev/server/web/page/project/compare/revision-compare.cssindex 08b5e1ba40..77320f8da9 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/compare/revision-compare.css+++ b/web/src/main/java/com/turbodev/server/web/page/project/compare/revision-compare.css@@ -1,50 +1,42 @@-#revision-compare {- padding: 20px 20px 0 20px;-}-#revision-compare>.head {- font-size: 18px;- margin-bottom: 20px;-}-#revision-compare>.body>div {+#revision-compare>div {margin-bottom: 20px;}-#revision-compare>.body>.revisions {+#revision-compare>.revisions {margin-bottom: 20px;width: auto;}-#revision-compare>.body>.revisions td {+#revision-compare>.revisions td {vertical-align: middle;- background: #F5F5F5;- border: 1px solid #DDD;- border-radius: 4px;+ background: #FAFAFA;+ border: 2px solid #E0E0E0;padding: 12px;}-#revision-compare>.body>.revisions td.action {+#revision-compare>.revisions td.action {text-align: center;background: white;border-top: none;border-bottom: none;}-#revision-compare>.body>.revisions .revision .title label {+#revision-compare>.revisions .revision .title label {font-size: 16px;color: #888;font-weight: normal;}-#revision-compare>.body>.revisions .revision .title input {+#revision-compare>.revisions .revision .title input {margin-left: 16px;}-#revision-compare>.body>.revisions .revision .title span {+#revision-compare>.revisions .revision .title span {color: #888;margin-left: 4px;}-#revision-compare>.body>.revisions .revision .title a {+#revision-compare>.revisions .revision .title a {color: #666;margin-left: 4px;}-#revision-compare>.body>.revisions .revision .message {+#revision-compare>.revisions .revision .message {margin-top: 8px;}-#revision-compare>.body>.revisions .revision .message a {+#revision-compare>.revisions .revision .message a {font-size: 13px;color: #888;}diff --git a/web/src/main/java/com/turbodev/server/web/page/project/project.css b/web/src/main/java/com/turbodev/server/web/page/project/project.cssindex b92e37feb8..9365e69075 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/project.css+++ b/web/src/main/java/com/turbodev/server/web/page/project/project.css@@ -2,7 +2,7 @@margin-right: 4px;}.breadcrumb .project .more-info {- background: #444;+ background: #424242;padding: 0 8px;border-radius: 4px;font-size: 14px;@@ -10,48 +10,6 @@margin-left: 8px;}-#project>.sidebar>table>tbody>tr>td.nav>.mini-toggle {- display: block;- margin-top: -20px;- text-align: right;- font-size: 20px;- padding-right: 20px;- border-bottom: 1px solid #BBB;- text-decoration: none;- color: #666;- height: 31px;-}-#project>.sidebar>table>tbody>tr>td.nav>.mini-toggle:hover {- color: #333;-}-#project>.sidebar>table>tbody>tr>td.nav>.mini-toggle>span:before {- font-family: "FontAwesome";- content: "\f100";-}-#project>.sidebar>table>tbody>tr>td.mini.nav>.mini-toggle>span:before {- content: "\f101";-}-#project>.sidebar>table>tbody>tr>td.nav>.mini-toggle:hover {- background: #EEE;-}-#project>.sidebar>table>tbody>tr>td.nav>.tabs>li>a {- width: 220px;-}-#project>.sidebar>table>tbody>tr>td.mini.nav>.tabs>li>a {- width: auto;-}-#project>.sidebar>table>tbody>tr>td.mini.nav {- width: 40px;-}-#project>.sidebar>table>tbody>tr>td.mini.nav>.tabs>li>a>.text,-#project>.sidebar>table>tbody>tr>td.mini.nav>.tabs>li>a>.badge {- display: none;-}--.project.list, .new-project {- padding: 20px;-}-.no-commits>.head {font-size: 20px;font-weight: bold;diff --git a/web/src/main/java/com/turbodev/server/web/page/project/project.js b/web/src/main/java/com/turbodev/server/web/page/project/project.jsdeleted file mode 100644index 104f5676c9..0000000000--- a/web/src/main/java/com/turbodev/server/web/page/project/project.js+++ /dev/null@@ -1,25 +0,0 @@-turbodev.server.project = function() {- var $nav = $("#project>.sidebar>table>tbody>tr>td.nav");-- function enableTooltip() {- $nav.find("li a").each(function() {- $(this).attr("title", $(this).find(".text").text());- });- }-- var cookieKey = "project.miniSidebar";- if (Cookies.get(cookieKey) === "yes")- enableTooltip();-- $nav.find(">.mini-toggle").click(function() {- $nav.toggleClass("mini");- if ($nav.hasClass("mini")) {- Cookies.set(cookieKey, "yes", {expires: Infinity});- enableTooltip();- } else {- Cookies.set(cookieKey, "no", {expires: Infinity});- $nav.find("li a").removeAttr("title");- }- $(window).resize();- });-};\ No newline at end of filediff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/newrequest/new-request.css b/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/newrequest/new-request.cssindex 0e5d7e7112..a2b2135653 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/newrequest/new-request.css+++ b/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/newrequest/new-request.css@@ -1,6 +1,3 @@-#new-request {- padding: 20px 20px 0 20px;-}#new-request>.head {font-size: 18px;margin-bottom: 20px;diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestlist/RequestListPage.html b/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestlist/RequestListPage.htmlindex 1789c1a185..7540d8f727 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestlist/RequestListPage.html+++ b/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestlist/RequestListPage.html@@ -8,7 +8,8 @@<table class="body"><tr><td class="filter">- <div class="head">Filter options</div>+ <h4>Filter options</h4>+ <hr><div class="body"><form wicket:id="filterForm"><div wicket:id="editor" class="no-autofocus"></div>diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestlist/request-list.css b/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestlist/request-list.cssindex 3768f955ae..4dc61ccfe4 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestlist/request-list.css+++ b/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestlist/request-list.css@@ -1,6 +1,3 @@-#request-list {- padding: 20px;-}#request-list>.head {margin-bottom: 20px;}@@ -9,22 +6,14 @@}#request-list td.filter {width: 25%;- border: 1px solid #DDD;-}-#request-list td.filter>.head {- font-size: 16px;- border-bottom: 1px solid #DDD;- padding: 8px 12px;- background: #F2F2F2;-}-#request-list td.filter>.body {- padding: 12px;+ border: 2px solid #E0E0E0;+ padding: 20px;}#request-list td.spacing {width: 20px;}#request-list td.result {- border: 1px solid #DDD;+ border: 2px solid #E0E0E0;}#request-list td.request {color: #888;diff --git a/web/src/main/java/com/turbodev/server/web/page/project/setting/ProjectSettingPage.html b/web/src/main/java/com/turbodev/server/web/page/project/setting/ProjectSettingPage.htmlindex 5c91e0c331..5c1ff86f8c 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/setting/ProjectSettingPage.html+++ b/web/src/main/java/com/turbodev/server/web/page/project/setting/ProjectSettingPage.html@@ -1,14 +1,8 @@<wicket:extend><div id="project-setting">- <table>- <tr>- <td class="nav">- <ul wicket:id="projectSettingTabs" class="tabs list-unstyled"></ul>- </td>- <td class="content">- <wicket:child></wicket:child>- </td>- </tr>- </table>+ <div wicket:id="projectSettingSidebar"></div>+ <div class="content">+ <wicket:child></wicket:child>+ </div></div></wicket:extend>\ No newline at end of filediff --git a/web/src/main/java/com/turbodev/server/web/page/project/setting/ProjectSettingPage.java b/web/src/main/java/com/turbodev/server/web/page/project/setting/ProjectSettingPage.javaindex 7965df9ce0..0d68266c62 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/setting/ProjectSettingPage.java+++ b/web/src/main/java/com/turbodev/server/web/page/project/setting/ProjectSettingPage.java@@ -9,8 +9,9 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.request.mapper.parameter.PageParameters;import com.turbodev.server.security.SecurityUtils;+import com.turbodev.server.web.component.sidebar.SidebarPanel;import com.turbodev.server.web.component.tabbable.PageTab;-import com.turbodev.server.web.component.tabbable.Tabbable;+import com.turbodev.server.web.component.tabbable.Tab;import com.turbodev.server.web.page.project.ProjectPage;import com.turbodev.server.web.page.project.setting.authorization.ProjectAuthorizationsPage;import com.turbodev.server.web.page.project.setting.branchprotection.BranchProtectionPage;@@ -34,14 +35,20 @@ public abstract class ProjectSettingPage extends ProjectPage {protected void onInitialize() {super.onInitialize();- List<PageTab> tabs = new ArrayList<>();- tabs.add(new ProjectSettingTab("General Setting", "fa fa-fw fa-sliders", GeneralSettingPage.class));- tabs.add(new ProjectSettingTab("Authorizations", "fa fa-fw fa-user", ProjectAuthorizationsPage.class));- tabs.add(new ProjectSettingTab("Branch Protection", "fa fa-fw fa-lock", BranchProtectionPage.class));- tabs.add(new ProjectSettingTab("Tag Protection", "fa fa-fw fa-lock", TagProtectionPage.class));- tabs.add(new ProjectSettingTab("Commit Message Transform", "fa fa-fw fa-exchange", CommitMessageTransformPage.class));-- add(new Tabbable("projectSettingTabs", tabs));+ add(new SidebarPanel("projectSettingSidebar", null) {++ @Override+ protected List<? extends Tab> newTabs() {+ List<PageTab> tabs = new ArrayList<>();+ tabs.add(new ProjectSettingTab("General Setting", "fa fa-fw fa-sliders", GeneralSettingPage.class));+ tabs.add(new ProjectSettingTab("Authorizations", "fa fa-fw fa-user", ProjectAuthorizationsPage.class));+ tabs.add(new ProjectSettingTab("Branch Protection", "fa fa-fw fa-lock", BranchProtectionPage.class));+ tabs.add(new ProjectSettingTab("Tag Protection", "fa fa-fw fa-lock", TagProtectionPage.class));+ tabs.add(new ProjectSettingTab("Commit Message Transform", "fa fa-fw fa-exchange", CommitMessageTransformPage.class));+ return tabs;+ }++ });}@Overridediff --git a/web/src/main/java/com/turbodev/server/web/page/project/setting/project-setting.css b/web/src/main/java/com/turbodev/server/web/page/project/setting/project-setting.cssindex 7514175d71..ca642ebda7 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/setting/project-setting.css+++ b/web/src/main/java/com/turbodev/server/web/page/project/setting/project-setting.css@@ -1,27 +1,13 @@-#project-setting>table>tbody>tr>td.nav {- width: 200px;- border-right: 1px solid #DDD;- white-space: nowrap;- padding: 20px 0;+#project-setting>.sidebar {+ left: 240px;+ background: white;+ border-left: none;}-#project-setting>table>tbody>tr>td.nav a {- display: block;- color: #666;- text-decoration: none;- padding: 6px 12px;- font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;+#project-setting>.sidebar>.tabs>li>a {+ border-left: none;}-#project-setting>table>tbody>tr>td.nav li:hover a {- background: #F5F5F5;- color: #010203;-}-#project-setting>table>tbody>tr>td.nav li.active a {- background: #E8E8E8;- color: #010203;- font-weight: bold;-}-#project-setting>table>tbody>tr>td.content {- padding: 20px;+#project>.minimized.sidebar+.content>#project-setting>.sidebar {+ left: 44px;}#project-setting .general-setting form .delete {margin-right: 0;diff --git a/web/src/main/java/com/turbodev/server/web/page/project/stats/ProjectStatsResourceReference.java b/web/src/main/java/com/turbodev/server/web/page/project/stats/ProjectStatsResourceReference.javaindex 6e92c77068..c93452d3da 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/stats/ProjectStatsResourceReference.java+++ b/web/src/main/java/com/turbodev/server/web/page/project/stats/ProjectStatsResourceReference.java@@ -7,7 +7,7 @@ import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.request.resource.CssResourceReference;-import com.turbodev.server.web.assets.js.chart.ChartResourceReference;+import com.turbodev.server.web.asset.chart.ChartResourceReference;import com.turbodev.server.web.page.base.BaseDependentResourceReference;public class ProjectStatsResourceReference extends BaseDependentResourceReference {diff --git a/web/src/main/java/com/turbodev/server/web/page/project/tags/project-tags.css b/web/src/main/java/com/turbodev/server/web/page/project/tags/project-tags.cssindex 848937b662..6d80346e42 100644--- a/web/src/main/java/com/turbodev/server/web/page/project/tags/project-tags.css+++ b/web/src/main/java/com/turbodev/server/web/page/project/tags/project-tags.css@@ -1,7 +1,3 @@-#project-tags {- padding: 20px;-}-#project-tags .tag {border-top: 1px solid #DDD;padding: 8px 0;diff --git a/web/src/main/java/com/turbodev/server/web/page/test/TestPage.html b/web/src/main/java/com/turbodev/server/web/page/test/TestPage.htmlindex 795b443f3a..ffae30ec6f 100644--- a/web/src/main/java/com/turbodev/server/web/page/test/TestPage.html+++ b/web/src/main/java/com/turbodev/server/web/page/test/TestPage.html@@ -1,3 +1,4 @@<wicket:extend>- <a wicket:id="test">test</a>+ <a wicket:id="test">test></a>+ <span class="label label-danger">hello</span></wicket:extend>\ No newline at end of filediff --git a/web/src/main/java/com/turbodev/server/web/page/user/UserPage.html b/web/src/main/java/com/turbodev/server/web/page/user/UserPage.htmlindex 3f162be54c..599aa5e20e 100644--- a/web/src/main/java/com/turbodev/server/web/page/user/UserPage.html+++ b/web/src/main/java/com/turbodev/server/web/page/user/UserPage.html@@ -1,19 +1,11 @@<wicket:extend>- <div id="user" class="sidebar">- <table>- <tr>- <td class="nav">- <div class="head">- <div class="avatar">- <a wicket:id="avatar"><img wicket:id="avatar"></img></a>- </div>- </div>- <ul wicket:id="userTabs" class="tabs list-unstyled"></ul>- </td>- <td class="content">- <wicket:child></wicket:child>- </td>- </tr>- </table>+ <div id="user">+ <div wicket:id="sidebar"></div>+ <div class="content">+ <wicket:child></wicket:child>+ </div></div>+ <wicket:fragment wicket:id="sidebarHeadFrag">+ <a wicket:id="avatar"><img wicket:id="avatar"></img></a>+ </wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/web/src/main/java/com/turbodev/server/web/page/user/UserPage.java b/web/src/main/java/com/turbodev/server/web/page/user/UserPage.javaindex d2d5c6907c..5210f22490 100644--- a/web/src/main/java/com/turbodev/server/web/page/user/UserPage.java+++ b/web/src/main/java/com/turbodev/server/web/page/user/UserPage.java@@ -4,15 +4,16 @@ import java.util.ArrayList;import java.util.List;import org.apache.wicket.Component;+import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;-import com.turbodev.utils.StringUtils;import com.turbodev.server.TurboDev;import com.turbodev.server.manager.UserManager;import com.turbodev.server.model.User;@@ -20,10 +21,12 @@ import com.turbodev.server.security.SecurityUtils;import com.turbodev.server.web.ComponentRenderer;import com.turbodev.server.web.component.avatar.Avatar;import com.turbodev.server.web.component.link.ViewStateAwarePageLink;+import com.turbodev.server.web.component.sidebar.SidebarPanel;import com.turbodev.server.web.component.tabbable.PageTab;-import com.turbodev.server.web.component.tabbable.Tabbable;+import com.turbodev.server.web.component.tabbable.Tab;import com.turbodev.server.web.page.layout.LayoutPage;import com.turbodev.server.web.util.model.EntityModel;+import com.turbodev.utils.StringUtils;@SuppressWarnings("serial")public abstract class UserPage extends LayoutPage {@@ -43,40 +46,53 @@ public abstract class UserPage extends LayoutPage {protected void onInitialize() {super.onInitialize();- ViewStateAwarePageLink<Void> avatarLink = new ViewStateAwarePageLink<Void>("avatar",- AvatarEditPage.class, AvatarEditPage.paramsOf(getUser())) {+ add(new SidebarPanel("sidebar", null) {@Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- if (!isEnabled())- tag.setName("span");+ protected Component newHead(String componentId) {+ Fragment fragment = new Fragment(componentId, "sidebarHeadFrag", UserPage.this);+ ViewStateAwarePageLink<Void> avatarLink = new ViewStateAwarePageLink<Void>("avatar",+ AvatarEditPage.class, AvatarEditPage.paramsOf(getUser())) {++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ if (!isEnabled())+ tag.setName("span");+ }++ };+ if (!SecurityUtils.canManage(getUser())) {+ avatarLink.setEnabled(false);+ }+ avatarLink.add(new Avatar("avatar", userModel.getObject()));+ fragment.add(avatarLink);++ return fragment;+ }++ @Override+ protected List<? extends Tab> newTabs() {+ List<PageTab> tabs = new ArrayList<>();++ tabs.add(new UserTab("Profile", "fa fa-fw fa-list-alt", UserProfilePage.class));+ if (SecurityUtils.canManage(getUser())) {+ tabs.add(new UserTab("Edit Avatar", "fa fa-fw fa-picture-o", AvatarEditPage.class));++ if (StringUtils.isNotBlank(getUser().getPassword()))+ tabs.add(new UserTab("Change Password", "fa fa-fw fa-key", PasswordEditPage.class));+ tabs.add(new UserTab("Access Token", "fa fa-fw fa-key", TokenGeneratePage.class));+ }+ tabs.add(new UserTab("Belonging Groups", "fa fa-fw fa-group", UserMembershipsPage.class));+ if (SecurityUtils.isAdministrator())+ tabs.add(new UserTab("Authorized Projects", "fa fa-fw fa-ext fa-repo", UserAuthorizationsPage.class));+ if (SecurityUtils.canManage(getUser()))+ tabs.add(new UserTab("Tasks", "fa fa-fw fa-bell-o", TaskListPage.class));++ return tabs;}- };- if (!SecurityUtils.canManage(getUser())) {- avatarLink.setEnabled(false);- }- add(avatarLink);- avatarLink.add(new Avatar("avatar", userModel.getObject()));-- List<PageTab> tabs = new ArrayList<>();-- tabs.add(new UserTab("Profile", "fa fa-fw fa-list-alt", UserProfilePage.class));- if (SecurityUtils.canManage(getUser())) {- tabs.add(new UserTab("Edit Avatar", "fa fa-fw fa-picture-o", AvatarEditPage.class));-- if (StringUtils.isNotBlank(getUser().getPassword()))- tabs.add(new UserTab("Change Password", "fa fa-fw fa-key", PasswordEditPage.class));- tabs.add(new UserTab("Access Token", "fa fa-fw fa-key", TokenGeneratePage.class));- }- tabs.add(new UserTab("Belonging Groups", "fa fa-fw fa-group", UserMembershipsPage.class));- if (SecurityUtils.isAdministrator())- tabs.add(new UserTab("Authorized Projects", "fa fa-fw fa-ext fa-repo", UserAuthorizationsPage.class));- if (SecurityUtils.canManage(getUser()))- tabs.add(new UserTab("Tasks", "fa fa-fw fa-bell-o", TaskListPage.class));-- add(new Tabbable("userTabs", tabs));+ });}@Override@@ -128,11 +144,15 @@ public abstract class UserPage extends LayoutPage {@Overridepublic Component render(String componentId) {+ Label label;if (SecurityUtils.isAdministrator()) {- return new Label(componentId, getUser().getDisplayName());+ label = new Label(componentId, getUser().getDisplayName());} else {- return new Label(componentId, "User (" + getUser().getDisplayName() + ")");+ label = new Label(componentId, "User (" + getUser().getDisplayName() + ")");}+ label.add(AttributeAppender.append("class", "name"));+ label.add(AttributeAppender.append("title", getUser().getDisplayName()));+ return label;}});diff --git a/web/src/main/java/com/turbodev/server/web/page/user/UserTabLink.html b/web/src/main/java/com/turbodev/server/web/page/user/UserTabLink.htmlindex 4686880dcd..f9086e7c60 100644--- a/web/src/main/java/com/turbodev/server/web/page/user/UserTabLink.html+++ b/web/src/main/java/com/turbodev/server/web/page/user/UserTabLink.html@@ -1,3 +1,3 @@<wicket:panel>- <a wicket:id="link"><span wicket:id="icon"></span> <span wicket:id="label"></span></a>+ <a wicket:id="link"><span wicket:id="icon"></span> <span wicket:id="label" class="text"></span></a></wicket:panel>\ No newline at end of filediff --git a/web/src/main/java/com/turbodev/server/web/page/user/user.css b/web/src/main/java/com/turbodev/server/web/page/user/user.cssindex 4b4a4ec3ad..6ca3219db8 100644--- a/web/src/main/java/com/turbodev/server/web/page/user/user.css+++ b/web/src/main/java/com/turbodev/server/web/page/user/user.css@@ -1,18 +1,15 @@-#user.sidebar>table>tbody>tr>td.nav>.tabs>li>a {- width: 220px;+#user>.sidebar>.head {+ text-align: center;+ vertical-align: center;+ border-bottom: 2px solid #E0E0E0;+ padding: 8px;}-#user.sidebar>table>tbody>tr>td.nav>.head {- margin: -20px 0 20px 0;- padding: 10px 10px 0 10px;- border-bottom: 1px solid #DDD;+#user>.sidebar>.tabs {+ top: 180px;}-#user.sidebar>table>tbody>tr>td.nav>.head>div.avatar img {- height: 200px;- width: 200px;- margin-bottom: 10px;-}-#user.sidebar>table>tbody>tr>td.content {- padding: 20px;+#user>.sidebar>.head img {+ height: 160px;+ width: 160px;}#user .avatar-edit .upload {@@ -30,9 +27,6 @@width: 240px;}-.user.list, .new-user {- padding: 20px;-}.user.list .actions a {color: #666;}diff --git a/web/src/main/java/com/turbodev/server/web/util/WicketUtils.java b/web/src/main/java/com/turbodev/server/web/util/WicketUtils.javaindex 769e951849..53a7c2bcca 100644--- a/web/src/main/java/com/turbodev/server/web/util/WicketUtils.java+++ b/web/src/main/java/com/turbodev/server/web/util/WicketUtils.java@@ -12,6 +12,7 @@ import org.apache.wicket.protocol.ws.api.registry.PageIdKey;import org.apache.wicket.request.Url;import org.apache.wicket.request.cycle.RequestCycle;+import com.turbodev.server.web.WebSession;import com.turbodev.server.web.websocket.PageKey;public class WicketUtils {@@ -44,6 +45,14 @@ public class WicketUtils {return null;}+ public static boolean isDevice() {+ String userAgent = WebSession.get().getClientInfo().getUserAgent().toLowerCase();+ return userAgent.indexOf("android") != -1+ || userAgent.indexOf("iphone") != -1+ || userAgent.indexOf("ipad") != -1+ || userAgent.indexOf("windows phone") != -1;+ }+public static void markLastVisibleChild(WebMarkupContainer container) {Component lastVisible = null;for (Component child: container) {