Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WINDUP-1254 #153

Merged
merged 5 commits into from
Jan 10, 2017
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package org.jboss.windup.web.addons.websupport;

import org.jboss.windup.graph.GraphContext;

/**
* @author <a href="mailto:jesse.sightler@gmail.com">Jesse Sightler</a>
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import freemarker.template.TemplateMethodModelEx;
import freemarker.template.TemplateModel;
import freemarker.template.TemplateModelException;
import freemarker.template.utility.StringUtil;
import org.apache.commons.lang3.StringUtils;

/**
Expand Down Expand Up @@ -58,6 +57,7 @@ protected TemplateModel createModel(ObjectWrapper objectWrapper, ServletContext

hashModel.put("dispatchRequest", new TemplateMethodModelEx()
{
@SuppressWarnings("rawtypes")
@Override
public Object exec(List arguments) throws TemplateModelException
{
Expand Down Expand Up @@ -107,7 +107,7 @@ protected String requestUrlToTemplatePath(HttpServletRequest request) throws Ser

private void deriveResponseContentType(HttpServletRequest request, HttpServletResponse response)
{
Map<String, String> suffixToMimeType = new HashMap();
Map<String, String> suffixToMimeType = new HashMap<>();
suffixToMimeType.put("html", "text/html");
suffixToMimeType.put("xml", "text/xml");
suffixToMimeType.put("json", "application/json");
Expand Down
2 changes: 1 addition & 1 deletion ui/src/main/webapp/css/windup-web.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
}

.container-fluid {
padding-top: 140px;
padding-top: 60px;
}


Expand Down
2 changes: 0 additions & 2 deletions ui/src/main/webapp/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import {GroupPageComponent} from "./components/group.page.component";
import {RegisterApplicationFormComponent} from "./components/register-application-form.component";
import {ProgressBarComponent} from "./components/progress-bar.component";
import {NavbarComponent} from "./components/navbar.component";
import {BreadCrumbsComponent} from "./components/breadcrumbs.component";
import {ConfigurationService} from "./services/configuration.service";
import {AnalysisContextService} from "./services/analysis-context.service";
import {ApplicationGroupService} from "./services/application-group.service";
Expand Down Expand Up @@ -128,7 +127,6 @@ import {ActiveExecutionsProgressbarComponent} from "./components/executions/acti
// Components
AddRulesPathModalComponent,
AnalysisContextAdvancedOptionsModalComponent,
BreadCrumbsComponent,
ConfirmationModalComponent,
ModalDialogComponent,
NavbarComponent,
Expand Down
11 changes: 0 additions & 11 deletions ui/src/main/webapp/src/app/components/breadcrumbs.component.html

This file was deleted.

36 changes: 0 additions & 36 deletions ui/src/main/webapp/src/app/components/breadcrumbs.component.ts

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<navbar></navbar>
<div class="container-fluid">
<!-- breadcrumbs></breadcrumbs -->
<div class="row row-cards-pf">
<wu-breadcrumbs></wu-breadcrumbs>
<ap-notification></ap-notification>
</div>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<navbar></navbar>
<wu-context-menu [menuItems]="menuItems"></wu-context-menu>
<div class="container-fluid container-cards-pf container-pf-nav-pf-vertical nav-pf-persistent-secondary">
<!-- breadcrumbs></breadcrumbs -->
<div class="row row-cards-pf">
<wu-breadcrumbs></wu-breadcrumbs>
<ap-notification></ap-notification>
</div>

<div class="row row-cards-pf">
<!-- Routed views go here -->
<router-outlet></router-outlet>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {AbstractComponent} from "../AbstractComponent";
@Component({
templateUrl: './group-layout.component.html',
styles: [
`:host /deep/ .nav-pf-vertical { top: 139px; }`
`:host /deep/ .nav-pf-vertical { top: 82px; }`
]
})
export class GroupLayoutComponent extends AbstractComponent implements OnInit, OnDestroy {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@
</li>
</ul>
</div>
<wu-breadcrumbs></wu-breadcrumbs>
</nav>