Skip to content
This repository was archived by the owner on Nov 25, 2020. It is now read-only.

Commit 7ed8c93

Browse files
committed
Fix AjxpTabulator layout when using Flexbox
Add Roboto fontface.
1 parent c594b85 commit 7ed8c93

File tree

11 files changed

+261
-7
lines changed

11 files changed

+261
-7
lines changed

core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpTabulator.js

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,14 @@ Class.create("AjxpTabulator", AjxpPane, {
5252
// tab Element must implement : showElement() and resize() methods.
5353
// Add drop shadow here, otherwise the negative value gets stuck in the CSS compilation...
5454
var div = new Element('div', {className:'tabulatorContainer panelHeader'});
55+
if(htmlElement.hasClassName('horizontal_tabulator') && Modernizr.flexbox){
56+
var panelsCont = new Element('div', {className:'tabulatorPanelsContainer'});
57+
this.htmlElement.insert(panelsCont);
58+
this.htmlElement.select('> div').each(function(d){
59+
if(d.hasClassName('tabulatorPanelsContainer')) return ;
60+
panelsCont.insert(d);
61+
});
62+
}
5563
$(this.htmlElement).insert({top:div});
5664
var shortener = this.shortenLabel;
5765

@@ -218,6 +226,9 @@ Class.create("AjxpTabulator", AjxpPane, {
218226
contentNodes.each(function(addNode){
219227
var cdataContent = addNode.firstChild.nodeValue;
220228
var anchor = this.htmlElement;
229+
if(this.htmlElement && this.htmlElement.down('.tabulatorPanelsContainer')){
230+
anchor = this.htmlElement.down('.tabulatorPanelsContainer');
231+
}
221232
if(cdataContent && anchor){
222233
if(!anchor.down('#'+addNode.getAttribute("id"))){
223234
anchor.insert(cdataContent);
@@ -234,6 +245,8 @@ Class.create("AjxpTabulator", AjxpPane, {
234245
/**
235246
*
236247
* @param tabInfo
248+
* @param paneInfo
249+
* @param skipStateSave
237250
*/
238251
addTab: function(tabInfo, paneInfo, skipStateSave){
239252

@@ -274,7 +287,9 @@ Class.create("AjxpTabulator", AjxpPane, {
274287
tabInfo.element = "dynamic-panel-" + randomId;
275288
}
276289

277-
$(this.htmlElement).insert(new Element("div", {id:tabInfo.element}));
290+
if(!$(this.htmlElement).down('#'+tabInfo.element)){
291+
$(this.htmlElement).insert(new Element("div", {id:tabInfo.element}));
292+
}
278293
fitHeightToBottom($(this.htmlElement).down("#"+tabInfo.element), null, this.options.fitMarginBottom);
279294
var shortener = this.shortenLabel;
280295

@@ -476,8 +491,10 @@ Class.create("AjxpTabulator", AjxpPane, {
476491
if(this.htmlElement.hasClassName('horizontal_tabulator')){
477492
var tabContainer = this.htmlElement.down('div.tabulatorContainer');
478493
fitHeightToBottom(tabContainer, null, this.options.fitMarginBottom);
479-
var pWidth = this.htmlElement.getWidth() - tabContainer.getWidth();
480-
this.htmlElement.select('> div:not(.tabulatorContainer)').invoke('setStyle', {width:pWidth+'px'});
494+
if(!Modernizr.flexbox){
495+
var pWidth = this.htmlElement.getWidth() - tabContainer.getWidth();
496+
this.htmlElement.select('> div:not(.tabulatorContainer)').invoke('setStyle', {width:pWidth+'px'});
497+
}
481498
}
482499
var ajxpObject = this.getAndSetAjxpObject(this.selectedTabInfo);
483500
if(ajxpObject && !ajxpObject.fullScreenMode){

core/src/plugins/gui.ajax/res/themes/orbit/css/ajaxplorer.css

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6127,6 +6127,18 @@ div.flat_tabulator > div:not(.tabulatorContainer){
61276127
background-color: #30383A;
61286128
}
61296129

6130+
.flexbox div.horizontal_tabulator{
6131+
flex-direction: row;
6132+
-webkit-flex-direction: row;
6133+
6134+
}
6135+
.flexbox div.horizontal_tabulator div.tabulatorContainer {
6136+
float: none;
6137+
height: auto;
6138+
flex:0 0 240px;
6139+
-webkit-flex:0 0 240px;
6140+
}
6141+
61306142
div#userdashboard_main_tab.horizontal_tabulator div.tabulatorContainer{
61316143
padding-top: 62px;
61326144
}
@@ -6138,7 +6150,7 @@ div#userdashboard_myparams_title{
61386150
padding: 22px;
61396151
height: 17px;
61406152
font-size: 13px;
6141-
width: 257px;
6153+
width: 196px;
61426154
left: 0;
61436155
background-color: #222;
61446156
letter-spacing: 1px;
@@ -6205,12 +6217,17 @@ div.horizontal_tabulator > div > div.horizontal_tabulator div.tabulatorContainer
62056217
text-shadow: none;
62066218
}
62076219

6208-
div.horizontal_tabulator > div:not(.tabulatorContainer){
6220+
.no-flexbox div.horizontal_tabulator > div:not(.tabulatorContainer){
62096221
float: left;
62106222
padding: 0 !important;
62116223
width:78%;
62126224
}
62136225

6226+
.flexbox div.horizontal_tabulator > div.tabulatorPanelsContainer{
6227+
flex:1;
6228+
-webkit-flex: 1;
6229+
}
6230+
62146231
#breadcrumb{
62156232
display: block;
62166233
float: left;

core/src/plugins/gui.ajax/res/themes/orbit/css/allz.css

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/src/plugins/gui.ajax/res/themes/orbit/css/fontfaces.css

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,20 @@
1414
url('../open-sans-fontfacekit/opensans_light/OpenSans-Light-webfont.woff') format('woff'),
1515
url('../open-sans-fontfacekit/opensans_light/OpenSans-Light-webfont.ttf') format('truetype'),
1616
url('../open-sans-fontfacekit/opensans_light/OpenSans-Light-webfont.svg#webfont') format('svg');
17-
}
17+
}
18+
19+
@font-face {
20+
font-family: 'Roboto';
21+
font-weight: 300;
22+
src: url(../roboto-font/roboto-light.woff2) format('woff2'), url(../roboto-font/roboto-light.woff) format('woff');
23+
}
24+
@font-face {
25+
font-family: 'Roboto';
26+
font-weight: 400;
27+
src: url(../roboto-font/roboto.woff2) format('woff2'), url(../roboto-font/roboto.woff) format('woff');
28+
}
29+
@font-face {
30+
font-family: 'Roboto';
31+
font-weight: 500;
32+
src: url(../roboto-font/roboto-medium.woff2) format('woff2'), url(../roboto-font/roboto-medium.woff) format('woff');
33+
}
Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright [yyyy] [name of copyright owner]
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)