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.

Sign up for GitHub

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

Jump to bottom

Maarc summit2018 #1309

Merged
merged 31 commits into from Jun 4, 2018
Merged

Maarc summit2018 #1309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
a44e3f9
Correcting various layout issues. Information button added.
Maarc May 3, 2018
fdba3b0
Fixing techBoxes (recognition of logging and some processing techs)
Maarc May 3, 2018
f3e5782
Fix "other" tech box
Maarc May 3, 2018
3b7fa8c
Database drivers added
Maarc May 3, 2018
a5ea375
Fix
Maarc May 3, 2018
423ebb2
Fix
Maarc May 3, 2018
1a3c4a4
Minor change
Maarc May 3, 2018
7e3802c
Fix height punchcard board.
Maarc May 3, 2018
00b0d8c
Minor fixes
Maarc May 3, 2018
6ff9706
Minor fix (source.ftl)
Maarc May 3, 2018
2081123
MC
Maarc May 14, 2018
af57e5c
Minor change
May 15, 2018
13d76fc
Fixing broken tech box layout (zoom)
May 15, 2018
400b9db
Icons updated
May 15, 2018
48c99d7
White line issue fixed
May 15, 2018
a3622e6
Punch diagram fixed (width last columns)
May 15, 2018
83de0d8
Punch diagram removed comments
May 15, 2018
12c5bfd
Fixed issue with fontawesome.
Maarc May 15, 2018
94bfd42
Updated icons
Maarc May 15, 2018
9b42aff
Add space between icon and menu title
Maarc May 15, 2018
959ab2e
Fixed display issue while zooming on the tech-box-report.
Maarc May 15, 2018
c82f469
Removed useless separator
Maarc May 15, 2018
057a749
Minor fix
Maarc May 15, 2018
315926f
Added sorting for boxes
Maarc May 15, 2018
9d3b266
Application list: made filter box wider
Maarc May 15, 2018
da412b0
Increased size of search results and centered the tags.
Maarc May 15, 2018
c299b8c
Minor fix
May 15, 2018
f4e4837
Minor renaming
May 15, 2018
7f534f2
Updated unit test to reflect technology chart name change
jsight May 24, 2018
9c3a21b
Fixed file search iteration removal. Previously this would consistent…
jsight May 25, 2018
46ade46
Summit 2018 - formatting fixes
jsight Jun 4, 2018
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
4 changes: 2 additions & 2 deletions .../org/jboss/windup/reporting/rules/generation/techreport/CreateTechReportRuleProvider.java
View file
Open in desktop
Expand Up @@ -116,7 +116,7 @@ private TechReportModel createTechReportPunchCard(
report.setReportName(REPORT_NAME_PUNCH);
report.setTemplatePath(TEMPLATE_PATH_PUNCH);
report.setDescription(REPORT_DESCRIPTION_PUNCH);
report.setReportIconClass("glyphicon glyphicon-tags");
report.setReportIconClass("fa fa-rocket");
report.setDisplayInGlobalApplicationIndex(true);
report.setDisplayInApplicationReportIndex(true);

Expand All @@ -133,7 +133,7 @@ private TechReportModel createTechReportBoxes(GraphContext graphContext, Project
report.setReportName(REPORT_NAME_BOXES);
report.setTemplatePath(TEMPLATE_PATH_BOXES);
report.setDescription(REPORT_DESCRIPTION_BOXES);
report.setReportIconClass("glyphicon glyphicon-tags");
report.setReportIconClass("fa fa-rocket");

// Set the filename for the report
new ReportService(graphContext).setUniqueFilename(report, "techReport-" + appModel.getName(), "html");
Expand Down
71 changes: 36 additions & 35 deletions ...rces/org/jboss/windup/reporting/rules/generation/techreport/techReport-hierarchy.tags.xml
View file
Open in desktop
Expand Up @@ -63,12 +63,11 @@
<tag name="techBox:web" title="Web" pseudo="true" parents="techRow:java-ee" icon="Misc_Network-Technical">
<tag ref="web"/>
</tag>
<tag name="techBox:rich" title="Rich" pseudo="true" parents="techRow:java-ee" icon="Hardware_Monitor-Webinar">
<tag name="techBox:rich" title="Rich" pseudo="true" parents="techRow:java-ee, techRow:embedded" icon="Hardware_Monitor-Webinar">
<tag ref="applet"/>
<tag ref="jnlp"/>
</tag>
<tag name="techBox:mvc" title="MVC" pseudo="true" parents="techRow:embedded" icon="Software_Application-Window">
<tag ref="applet"/>
<tag ref="spring-mvc"/>
<tag ref="struts"/>
<tag ref="wicket"/>
Expand All @@ -91,13 +90,13 @@
<tag ref="jax-ws"/>
<tag ref="jax-rs"/>
</tag>
<tag name="techBox:java-ee-other" title="Other" pseudo="true" parents="techRow:java-ee" icon="Office_SnackBasket">
<tag name="techBox:other" title="Other" pseudo="true" parents="techRow:java-ee, techRow:embedded" icon="Podcast">
<tag ref="jca"/>
<tag ref="jni"/>
<tag ref="mail"/>
<tag ref="rmi"/>
</tag>
<tag name="techBox:webservice" title="WebService" pseudo="true" parents="techRow:embedded" icon="Office_Enclave">
<tag name="techBox:webservice" title="WebService" pseudo="true" parents="techRow:embedded" icon="Global_Ecosystem">
<tag ref="webservices"/>
</tag>
<tag name="techBox:rest" title="REST" pseudo="true" parents="techRow:embedded" icon="Science_Circuit">
Expand All @@ -111,28 +110,29 @@
<tag name="techBox:ogm" title="OGM" pseudo="true" parents="techRow:java-ee" icon="Diagram_DevelopmentModel">
</tag>
-->
<tag name="techBox:jdbc" title="JDBC" pseudo="true" parents="techRow:java-ee" icon="Hardware_Storage-A-Stack">
<tag name="techBox:jdbc" title="Database" pseudo="true" parents="techRow:java-ee" icon="Hardware_Storage-A-Stack">
<tag ref="jdbc"/>
</tag>
<tag name="techBox:Caching" title="Caching" pseudo="true" parents="techRow:java-ee, techRow:embedded" icon="science_brain"><!-- Alternative: Recycle_Symbol. I couldn't find the "brain profile". -->
<tag name="techBox:caching" title="Caching" pseudo="true" parents="techRow:java-ee, techRow:embedded" icon="science_brain"><!-- Alternative: Recycle_Symbol. I couldn't find the "brain profile". -->
<tag ref="cache"/>
</tag>
<tag name="techBox:object-mapping" title="Object Mapping" pseudo="true" parents="techRow:embedded" icon="Diagram_DevelopmentModel"></tag>
<tag name="techBox:Persistence" title="Persistence" pseudo="true" parents="techRow:java-ee" icon="Hardware_Storage-A-Stack"></tag>
<tag name="techBox:persistence" title="Persistence" pseudo="true" parents="techRow:java-ee" icon="Notepad"></tag>
<tag name="techBox:database-driver" title="Database Driver" pseudo="true" parents="techRow:embedded" icon="Car_Front"></tag>
</tag>
<tag name="techSector04:Sustain" title="Sustain" color="#DB4437" pseudo="true">
<tag name="techBox:Transactions" title="Transactions" pseudo="true" parents="techRow:java-ee" icon="Object_CashRegister-POS"></tag>
<tag name="techBox:Clustering" title="Clustering" pseudo="true" parents="techRow:java-ee" icon="Hardware_Server-A-Stack"></tag>
<tag name="techBox:Security" title="Security" pseudo="true" parents="techRow:java-ee, techRow:embedded" icon="Object_Shield-CoatOfArms"></tag>
<tag name="techBox:Logging" title="Logging" pseudo="true" parents="techRow:embedded" icon="Object_Book-Open"></tag>
<tag name="techBox:Test" title="Test" pseudo="true" parents="techRow:embedded" icon="Science_Explosion"></tag>
<tag name="techBox:transactions" title="Transactions" pseudo="true" parents="techRow:java-ee, techRow:embedded" icon="Object_CashRegister-POS"></tag>
<tag name="techBox:clustering" title="Clustering" pseudo="true" parents="techRow:java-ee" icon="Hardware_Server-A-Stack"></tag>
<tag name="techBox:security" title="Security" pseudo="true" parents="techRow:java-ee, techRow:embedded" icon="Object_Shield-CoatOfArms"></tag>
<tag name="techBox:logging" title="Logging" pseudo="true" parents="techRow:embedded" icon="Object_Book-Open"></tag>
<tag name="techBox:test" title="Test" pseudo="true" parents="techRow:embedded" icon="Science_Explosion"></tag>
</tag>
<tag name="techSector05:Execute" title="Execute" color="#674EA7" pseudo="true">
<tag name="techBox:Processing" title="Processing" pseudo="true" parents="techRow:java-ee, techRow:embedded" icon="Hardware_Processor-Compute"/>
<tag name="techBox:ioc" title="IoC" pseudo="true" parents="techRow:java-ee, techRow:embedded" icon="Arrows_Interoperable-CrossPlatform"/>
<tag name="techBox:Rules" title="Rules &amp; Processes" pseudo="true" parents="techRow:embedded" icon="Object_Gear-Group"/>
<tag name="techBox:Integration" title="Integration" pseudo="true" parents="techRow:embedded" icon="Software_API"/>
<tag name="techBox:3rd-party" title="3rd party" pseudo="true" parents="techRow:embedded" icon="Office_SnackBasket"/>
<tag name="techBox:processing" title="Processing" pseudo="true" parents="techRow:java-ee, techRow:embedded" icon="Hardware_Processor-Compute"/>
<tag name="techBox:ioc" title="Inversion of Control" pseudo="true" parents="techRow:java-ee, techRow:embedded" icon="Arrows_Interoperable-CrossPlatform"/>
<tag name="techBox:rules" title="Rules &amp; Processes" pseudo="true" parents="techRow:embedded" icon="Object_Gear-Group"/>
<tag name="techBox:integration" title="Integration" pseudo="true" parents="techRow:embedded" icon="Software_API"/>
<tag name="techBox:3rd-party" title="3rd party" pseudo="true" parents="techRow:embedded" icon="Shopping_Cart"/>
</tag>
</tag>

Expand Down Expand Up @@ -161,30 +161,31 @@
</tag>
<tag name="techReport:placeBoxes">
<tag pseudo="true" name="place:3rd party" title="3rd party" parents="techBox:3rd-party"/>
<tag pseudo="true" name="place:Batch" title="Batch" parents="techBox:Batch"/> <!-- Not a box? -->
<tag pseudo="true" name="place:Bean" title="Bean" parents="techBox:EJB"/>
<tag pseudo="true" name="place:Caching" title="Caching" parents="techBox:Caching"/>
<tag pseudo="true" name="place:CDI" title="CDI" parents="techBox:CDI"/> <!-- Not a box? -->
<tag pseudo="true" name="place:Clustering" title="Clustering" parents="techBox:Clustering"/>
<tag pseudo="true" name="place:Batch" title="Batch" parents="techBox:processing"/> <!-- Not a box? -->
<tag pseudo="true" name="place:Bean" title="Bean" parents="techBox:ejb"/>
<tag pseudo="true" name="place:Caching" title="Caching" parents="techBox:caching"/>
<tag pseudo="true" name="place:CDI" title="CDI" parents="techBox:processing"/> <!-- Not a box? -->
<tag pseudo="true" name="place:Clustering" title="Clustering" parents="techBox:clustering"/>
<tag pseudo="true" name="place:Database" title="Database" parents="techBox:jdbc"/>
<tag pseudo="true" name="place:HTTP" title="HTTP" parents="techBox:HTTP"/>
<tag pseudo="true" name="place:Integration" title="Integration" parents="techBox:Integration"/>
<tag pseudo="true" name="place:Database Driver" title="Database Driver" parents="techBox:database-driver"/>
<tag pseudo="true" name="place:HTTP" title="HTTP" parents="techBox:http"/>
<tag pseudo="true" name="place:Integration" title="Integration" parents="techBox:integration"/>
<tag pseudo="true" name="place:Inversion of Control" title="Inversion of Control" parents="techBox:ioc"/>
<tag pseudo="true" name="place:JSON-P" title="JSON-P" parents="techBox:Processing"/> <!-- Not a box? WINDUPRULE-296 -->
<tag pseudo="true" name="place:Logging" title="Logging" parents="techBox:Logging"/>
<tag pseudo="true" name="place:Markup" title="Markup" parents="techBox:Markup"/>
<tag pseudo="true" name="place:Messaging" title="Messaging" parents="techBox:Messaging"/>
<tag pseudo="true" name="place:JSON-P" title="JSON-P" parents="techBox:processing"/> <!-- Not a box? WINDUPRULE-296 -->
<tag pseudo="true" name="place:Logging" title="Logging" parents="techBox:logging"/>
<tag pseudo="true" name="place:Markup" title="Markup" parents="techBox:markup"/>
<tag pseudo="true" name="place:Messaging" title="Messaging" parents="techBox:messaging"/>
<tag pseudo="true" name="place:MVC" title="MVC" parents="techBox:mvc"/>
<tag pseudo="true" name="place:Object Mapping" title="Object Mapping" parents="techBox:object-mapping"/>
<tag pseudo="true" name="place:Other" title="Other" parents="techBox:Other"/>
<tag pseudo="true" name="place:Persistence" title="Processing" parents="techBox:Persistence"/>
<tag pseudo="true" name="place:Processing" title="Processing" parents="techBox:Processing"/>
<tag pseudo="true" name="place:Other" title="Other" parents="techBox:other"/>
<tag pseudo="true" name="place:Persistence" title="Processing" parents="techBox:persistence"/>
<tag pseudo="true" name="place:Processing" title="Processing" parents="techBox:processing"/>
<tag pseudo="true" name="place:REST" title="REST" parents="techBox:rest"/>
<tag pseudo="true" name="place:Rich" title="Rich" parents="techBox:rich"/>
<tag pseudo="true" name="place:Rules and Processes" title="Rules and Processes" parents="techBox:Rules"/>
<tag pseudo="true" name="place:Security" title="Security" parents="techBox:Security"/>
<tag pseudo="true" name="place:Test" title="Test" parents="techBox:Test"/>
<tag pseudo="true" name="place:Transaction" title="Transaction" parents="techBox:Transactions"/>
<tag pseudo="true" name="place:Rules and Processes" title="Rules and Processes" parents="techBox:rules"/>
<tag pseudo="true" name="place:Security" title="Security" parents="techBox:security"/>
<tag pseudo="true" name="place:Test" title="Test" parents="techBox:test"/>
<tag pseudo="true" name="place:Transaction" title="Transaction" parents="techBox:transactions"/>
<tag pseudo="true" name="place:Web" title="Web" parents="techBox:web"/>
<tag pseudo="true" name="place:Web Service" title="Web Service" parents="techBox:webservice"/>
</tag>
Expand Down
2 changes: 1 addition & 1 deletion reporting/impl/src/main/resources/reports/resources/css/font-awesome.min.css
View file
Open in desktop

Large diffs are not rendered by default.

27 changes: 14 additions & 13 deletions reporting/impl/src/main/resources/reports/resources/css/tech-report-punchcard.css
View file
Open in desktop
Expand Up @@ -17,10 +17,6 @@
.sectorStats ~ .sectorStats { border-left: none; }

table.technologiesPunchCard { border-collapse: collapse; }
table.technologiesPunchCard td,
table.technologiesPunchCard th {
/*border: 1px solid silver; /* debug */
}
tr.headersSector { font-size: 20pt; font-weight: bold; }
tr.headersSector td { text-align: center; }

Expand Down Expand Up @@ -68,28 +64,33 @@ table.technologiesPunchCard tbody tr td, table.technologiesPunchCard thead tr td

table.technologiesPunchCard tbody tr td:nth-last-child(2),
table.technologiesPunchCard tbody tr td:nth-last-child(3),
table.technologiesPunchCard tbody tr td:nth-last-child(4),
table.technologiesPunchCard thead tr td:nth-last-child(2),
table.technologiesPunchCard thead tr td:nth-last-child(3),
table.technologiesPunchCard thead tr td:nth-last-child(4) {
table.technologiesPunchCard thead tr td:nth-last-child(3) {
width: 57px;
min-width: 57px;
max-width: 57px;
}

table.technologiesPunchCard thead tr td:nth-last-child(1),
table.technologiesPunchCard tbody tr td:nth-last-child(1) {
width: auto;
table.technologiesPunchCard tbody tr td:nth-last-child(4),
table.technologiesPunchCard thead tr td:nth-last-child(4) {
width: 70px;
min-width: 70px;
max-width: 70px;
}

table.technologiesPunchCard tr td:nth-child(1) {
min-width: 350px;
table.technologiesPunchCard thead tr td:nth-last-child(4) div {
width: 52px;
}

table.technologiesPunchCard thead tr td:nth-last-child(1),
table.technologiesPunchCard tbody tr td:nth-last-child(1) { width: auto; }

table.technologiesPunchCard tr td:nth-child(1) { min-width: 350px; }

table.technologiesPunchCard tbody {
display: block;
overflow-y: scroll;
height: 40vh;
height: 55vh;
}

table.technologiesPunchCard {
Expand Down
52 changes: 39 additions & 13 deletions reporting/impl/src/main/resources/reports/resources/css/windup.css
View file
Open in desktop
Expand Up @@ -155,11 +155,6 @@ a.windup-file-location {
font-size: 13px;
}

.page-header-no-border {
border: 0;
margin-bottom: 0;
}

.page-header h1{
margin:15px;
}
Expand All @@ -174,7 +169,7 @@ a.windup-file-location {

.page-header h1 div.main {
border-bottom: 1px solid #ADD8E6;
margin: 0px 6em 0.5ex 0px;
margin: 0px 0.8ex 0px 0px;
width: auto;
color: #005387;
}
Expand Down Expand Up @@ -272,6 +267,10 @@ p.windup-contributors {
width: 13px;
}

.nav .glyphicon, .nav .fa {
margin-right: 5px;
}

.navbar-nav .active a {
background-color: rgb(137, 137, 137) !important;
}
Expand Down Expand Up @@ -410,8 +409,6 @@ strong.wu-navbar-header {
/************************* Filtering and sorting toolbar ******************************/
.toolbar-pf {
background: #fff;
border-bottom: 1px solid #d1d1d1;
box-shadow: 0 1px 0 rgba(3,3,3,.045);
padding-top: 10px;
}

Expand All @@ -424,20 +421,20 @@ strong.wu-navbar-header {
@media (min-width: 768px) {
.toolbar-pf-actions .toolbar-pf-filter {
padding-left: 0;
width: 25%;
width: 50%;
}

.toolbar-pf .form-group {
border-right: 1px solid #d1d1d1;
float: left;
margin-bottom: 0;
padding-left: 20px;
padding-right: 20px;
}
div#filter-div.form-group { border-right: 1px solid #d1d1d1; }
.toolbar-pf-results h5, .toolbar-pf-results p, .toolbar-pf-results ul { line-height: 40px; }

.toolbar-pf-results h5, .toolbar-pf-results p, .toolbar-pf-results ul {
line-height: 40px;
}
.row .toolbar-pf-results { height: 45px }
.list-inline { vertical-align: middle; }
}

.toolbar-pf .form-group .btn+.btn-link, .toolbar-pf .form-group .btn+.dropdown, .toolbar-pf .form-group .btn-group+.btn-link, .toolbar-pf .form-group .btn-group+.dropdown {
Expand Down Expand Up @@ -476,3 +473,32 @@ strong.wu-navbar-header {
color: #262626;
background-color: #eeeeee;
}

/** Tooltip */
h1 div.tooltip-inner {
text-align: center;
-webkit-border-radius: 0px;
-moz-border-radius: 0px;
border-radius: 0px;
margin-bottom: 6px;
background-color: #505050;
font-size: 14px;
max-width: 350px;
}

h1 div.tooltip {
border-bottom: 0px
}

h1 .glyphicon-info-sign:before {
font-size: 14px;
vertical-align: middle;
text-align: center;
}

.page-header-no-border {
border: 0;
margin-bottom: 0;
margin: 0 0 12px;
padding-bottom: 0;
}
Binary file modified reporting/impl/src/main/resources/reports/resources/fonts/FontAwesome.otf
View file
Open in desktop
Binary file not shown.
Binary file modified reporting/impl/src/main/resources/reports/resources/fonts/fontawesome-webfont.eot
View file
Open in desktop
Binary file not shown.