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

WW-4634 Centre alignment doesn't seem to work in Velocity tags #95

Merged
merged 19 commits into from
Jun 12, 2016
Merged

WW-4634 Centre alignment doesn't seem to work in Velocity tags #95

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
da8b13a
Merge pull request #8 from apache/master
victorsosa Mar 3, 2016
a5d7163
Merge pull request #9 from victorsosa/easymock_update
victorsosa Mar 3, 2016
6bb1ec6
Merge pull request #10 from apache/master
victorsosa Mar 4, 2016
379b752
Merge pull request #11 from apache/master
victorsosa Mar 27, 2016
47cf4ff
Merge pull request #13 from apache/master
victorsosa Apr 20, 2016
ca74ac3
Merge pull request #14 from apache/master
victorsosa May 4, 2016
6b36010
WW-4634
victorsosa May 17, 2016
b4facc8
Merge pull request #15 from apache/master
victorsosa May 17, 2016
f9e4a5e
Merge branch 'master' of github.com:victorsosa/struts
victorsosa May 17, 2016
ffdacf1
WW-4634
victorsosa May 17, 2016
d06c71d
WW-4634
victorsosa May 17, 2016
9e11b2c
WW-4634
victorsosa May 17, 2016
175d0d4
Add a class .tdInput for future and use align attribute with
victorsosa May 25, 2016
c70f240
Update styles.css
victorsosa May 25, 2016
dce6d3e
test fix
victorsosa May 25, 2016
30b74a3
Merge branch 'WW-4634' of github.com:victorsosa/struts into WW-4634
victorsosa May 25, 2016
2cd28b1
fix test
victorsosa May 25, 2016
8fea956
fix test cases
victorsosa May 25, 2016
e0b13a5
fix test cases
victorsosa May 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion core/src/main/resources/template/xhtml/controlheader.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,8 @@
*/
-->
<#include "/${parameters.templateDir}/${parameters.expandTheme}/controlheader-core.ftl" />
<td
<td
<#if parameters.align??>
class="tdAlign${parameters.align?html}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you use - to separate prefix and suffix?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You mean like this class="tdAlign-${parameters.align?html}" ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

</#if>
><#t/>
5 changes: 5 additions & 0 deletions core/src/main/resources/template/xhtml/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,8 @@
.tdCheckboxErrorMessage {text-align:left; vertical-align:top;}
.tdErrorMessage {text-align:center; vertical-align:top;}
.formButton {text-align:right;}

.tdAligncenter{text-align:center;}
.tdAlignright{text-align:right;}
.tdAlignleft{text-align:left;}
.tdAlignjustify{text-align:justify;}