The Unified and Autonomous Development Platform
Merge help menu into main menu
Robin Shen7c2a87fa94c0
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 adfd27ffc1..07e0b0e1ff 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@@ -11,4 +11,5 @@/* wicket default ajax lazyload style */.floating>.content>div>img[alt="Loading..."] {margin: 8px;-}\ No newline at end of file+}+diff --git a/web/src/main/java/com/turbodev/server/web/page/layout/LayoutPage.html b/web/src/main/java/com/turbodev/server/web/page/layout/LayoutPage.htmlindex 13fa22bae1..5758c45f33 100644--- a/web/src/main/java/com/turbodev/server/web/page/layout/LayoutPage.html+++ b/web/src/main/java/com/turbodev/server/web/page/layout/LayoutPage.html@@ -23,9 +23,6 @@</div></wicket:enclosure></div>- <div class="help pull-right">- <a wicket:id="help" title="Help"><i class="fa fa-question"></i></a>- </div><wicket:enclosure child="pushDisabled"><div class="push-disabled pull-right"><span wicket:id="pushDisabled" class="label label-danger">Git Push Disabled</span>@@ -42,10 +39,21 @@<a wicket:id="logout"><i class="fa fa-fw fa-sign-out"></i> Logout</a></div></wicket:fragment>- <wicket:fragment wicket:id="helpFrag">- <div class="turbodev-help">- <div>TurboDev <span wicket:id="productVersion"></span></div>+ <wicket:fragment wicket:id="navFrag">+ <div class="main-nav">+ <h4>TurboDev <span wicket:id="productVersion"></span></h4><ul>+ <li><a wicket:id="projects">Projects</a></li>+ <wicket:enclosure child="users">+ <li><a wicket:id="users">Users</a></li>+ </wicket:enclosure>+ <wicket:enclosure child="groups">+ <li><a wicket:id="groups">Groups</a></li>+ </wicket:enclosure>+ <wicket:enclosure child="administration">+ <li><a wicket:id="administration">Administration</a></li>+ </wicket:enclosure>+ <li class="divider"></li><li><a href="https://www.turbodev.com">Product Home</a></li><li><a wicket:id="docLink">Document</a></li><li><a href="mailto:[email protected]">Support & Bug Report</a></li>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 24de2db80f..72799da2aa 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@@ -6,7 +6,6 @@ import java.util.List;import org.apache.wicket.Component;import org.apache.wicket.RestartResponseAtInterceptPageException;-import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.event.IEvent;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;@@ -35,8 +34,6 @@ import com.turbodev.server.web.component.floating.AlignPlacement;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.menu.MenuItem;-import com.turbodev.server.web.component.menu.MenuLink;import com.turbodev.server.web.page.admin.systemsetting.SystemSettingPage;import com.turbodev.server.web.page.base.BasePage;import com.turbodev.server.web.page.group.GroupListPage;@@ -72,66 +69,20 @@ public abstract class LayoutPage extends BasePage {WebMarkupContainer head = new WebMarkupContainer("head");add(head);- head.add(new MenuLink("nav") {-- @Override- protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {- List<MenuItem> items = new ArrayList<>();- items.add(new MenuItem() {-- @Override- public String getLabel() {- return "Projects";- }-- @Override- public WebMarkupContainer newLink(String id) {- return new ViewStateAwarePageLink<Void>(id, ProjectListPage.class);- }-- });- if (SecurityUtils.isAdministrator()) {- items.add(new MenuItem() {-- @Override- public String getLabel() {- return "Users";- }-- @Override- public WebMarkupContainer newLink(String id) {- return new ViewStateAwarePageLink<Void>(id, UserListPage.class);- }-- });- items.add(new MenuItem() {+ head.add(new DropdownLink("nav") {- @Override- public String getLabel() {- return "Groups";- }-- @Override- public WebMarkupContainer newLink(String id) {- return new ViewStateAwarePageLink<Void>(id, GroupListPage.class);- }-- });- items.add(new MenuItem() {-- @Override- public String getLabel() {- return "Administration";- }-- @Override- public WebMarkupContainer newLink(String id) {- return new ViewStateAwarePageLink<Void>(id, SystemSettingPage.class);- }-- });- }- return items;+ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ Fragment fragment = new Fragment(id, "navFrag", LayoutPage.this);+ fragment.add(new ViewStateAwarePageLink<Void>("projects", ProjectListPage.class));+ fragment.add(new ViewStateAwarePageLink<Void>("users", UserListPage.class).setVisible(SecurityUtils.isAdministrator()));+ fragment.add(new ViewStateAwarePageLink<Void>("groups", GroupListPage.class).setVisible(SecurityUtils.isAdministrator()));+ fragment.add(new ViewStateAwarePageLink<Void>("administration", SystemSettingPage.class).setVisible(SecurityUtils.isAdministrator()));++ Plugin product = AppLoader.getProduct();+ fragment.add(new Label("productVersion", product.getVersion()));+ fragment.add(new ExternalLink("docLink", TurboDev.getInstance().getDocLink() + "/readme.md"));+ return fragment;}});@@ -162,25 +113,6 @@ public abstract class LayoutPage extends BasePage {head.add(new WebMarkupContainer("pushDisabled").setVisible(false));}- head.add(new DropdownLink("help") {-- @Override- protected void onInitialize(FloatingPanel dropdown) {- super.onInitialize(dropdown);- dropdown.add(AttributeAppender.append("class", " menu"));- }-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- Fragment fragment = new Fragment(id, "helpFrag", LayoutPage.this);- Plugin product = AppLoader.getProduct();- fragment.add(new Label("productVersion", product.getVersion()));- fragment.add(new ExternalLink("docLink", TurboDev.getInstance().getDocLink() + "/readme.md"));- return fragment;- }-- });-User user = getLoginUser();boolean signedIn = user != null;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 1c981e54c2..513ea88cff 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@@ -123,7 +123,34 @@top: 48px;}-.turbodev-help>div {- padding: 8px 16px;- font-weight: bold;+.main-nav {+ padding: 6px 0;+}+.main-nav>h4 {+ padding: 0 20px;+}+.main-nav ul {+ margin:0;+ padding: 0;+}+.main-nav li {+ white-space: nowrap;+}+.main-nav li a:hover {+ background-color: #f5f5f5;+}+.main-nav ul>li>a {+ position: relative;+ color: #333333;+ display: block;+ font-weight: normal;+ line-height: 20px;+ text-decoration: none;+ padding: 6px 24px;+ white-space: nowrap;}+.main-nav ul>li.divider {+ border-top: 1px solid #DDD;+ margin: 8px 0;+ height: 0;+}\ No newline at end of file