Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-23 23:33:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #11914 from 1P-Cusack/FogBugz/Case_7049

Browse source 
[Case 7049]: Remove unused fields and checkboxes from Edit.js
This commit is contained in:
Brad Hefta-Gaub 2017-12-07 09:18:26 -08:00 committed by GitHub
commit b91909011a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 282 additions and 280 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
scripts/system/html/css/edit-style.css
View file

@ -1415,6 +1415,9 @@ input#reset-to-natural-dimensions {
}
/* ----- Order of Menu items for Primitive ----- */
/* Entity Menu classes are specified by selected entity
within entityProperties.js
*/
#properties-list.ShapeMenu #general,
#properties-list.BoxMenu #general,
#properties-list.SphereMenu #general {
@ -1469,6 +1472,34 @@ input#reset-to-natural-dimensions {
display: none;
}
/* ----- ParticleEffectMenu ----- */
#properties-list.ParticleEffectMenu #general {
order: 1;
}
#properties-list.ParticleEffectMenu #collision-info {
order: 2;
}
#properties-list.ParticleEffectMenu #physical {
order: 3;
}
#properties-list.ParticleEffectMenu #spatial {
order: 4;
}
#properties-list.ParticleEffectMenu #behavior {
order: 5;
}
/* items to hide */
#properties-list.ParticleEffectMenu #base-color-section,
#properties-list.ParticleEffectMenu #hyperlink,
#properties-list.ParticleEffectMenu #light,
#properties-list.ParticleEffectMenu #model,
#properties-list.ParticleEffectMenu #shape-list,
#properties-list.ParticleEffectMenu #text,
#properties-list.ParticleEffectMenu #web,
#properties-list.ParticleEffectMenu #zone {
display: none;
}
/* ----- Order of Menu items for Light ----- */
#properties-list.LightMenu #general {
@ -1500,8 +1531,8 @@ input#reset-to-natural-dimensions {
display: none;
}
/* items to hide */
#properties-list.LightMenu .shape-group.shape-section.property.dropdown,
#properties-list.LightMenu color-section.color-control1 {
#properties-list.LightMenu #shape-list,
#properties-list.LightMenu #base-color-section {
display: none
}
@ -1536,8 +1567,8 @@ input#reset-to-natural-dimensions {
display: none;
}
/* items to hide */
#properties-list.ModelMenu .shape-group.shape-section.property.dropdown,
#properties-list.ModelMenu .color-section.color-control1 {
#properties-list.ModelMenu #shape-list,
#properties-list.ModelMenu #base-color-section {
display: none
}
@ -1572,8 +1603,8 @@ input#reset-to-natural-dimensions {
display: none;
}
/* items to hide */
#properties-list.ZoneMenu .shape-group.shape-section.property.dropdown,
#properties-list.ZoneMenu .color-section.color-control1 {
#properties-list.ZoneMenu #shape-list,
#properties-list.ZoneMenu #base-color-section {
display: none
}
@ -1608,8 +1639,8 @@ input#reset-to-natural-dimensions {
display: none;
}
/* items to hide */
#properties-list.WebMenu .shape-group.shape-section.property.dropdown,
#properties-list.WebMenu .color-section.color-control1 {
#properties-list.WebMenu #shape-list,
#properties-list.WebMenu #base-color-section {
display: none;
}
@ -1645,8 +1676,8 @@ input#reset-to-natural-dimensions {
display: none;
}
/* items to hide */
#properties-list.TextMenu .shape-group.shape-section.property.dropdown,
#properties-list.TextMenu .color-section.color-control1 {
#properties-list.TextMenu #shape-list,
#properties-list.TextMenu #base-color-section {
display: none
}

26
scripts/system/html/entityProperties.html
View file

@ -44,7 +44,7 @@
<fieldset id="general" class="major">
<div class="shape-group shape-section property dropdown">
<div class="shape-group shape-section property dropdown" id="shape-list">
<label for="property-shape">Shape</label>
<select name="SelectShape" id="property-shape">
<option value="Cube">Box</option>
@ -66,12 +66,19 @@
<label for="property-name">Name</label>
<input type="text" id="property-name">
</div>
<div class="physical-group color-section property color-control1">
<div class="color-picker" id="property-color-control1"></div>
<div class="physical-group color-section property rgb fstuple" id="base-color-section">
<div class="color-picker" id="property-color-control2"></div>
<label>Entity color</label>
<div class="tuple">
<div><input type="number" class="red" id="property-color-red"><label for="property-color-red">Red:</label></div>
<div><input type="number" class="green" id="property-color-green"><label for="property-color-green">Green:</label></div>
<div><input type="number" class="blue" id="property-color-blue"><label for="property-color-blue">Blue:</label></div>
</div>
</div>
</fieldset>
<fieldset id="collision-info">
<fieldset id="collision-info" class="major">
<legend class="section-header"> Collision<span>M</span> </legend>
<fieldset class="minor">
<div class="behavior-group property checkbox">
<input type="checkbox" id="property-collisionless">
@ -216,17 +223,6 @@
</div>
</fieldset>
</fieldset>
<fieldset class="minor">
<div class="physical-group color-section property rgb fstuple">
<div class="color-picker" id="property-color-control2"></div>
<label>Entity color</label>
<div class="tuple">
<div><input type="number" class="red" id="property-color-red"><label for="property-color-red">Red:</label></div>
<div><input type="number" class="green" id="property-color-green"><label for="property-color-green">Green:</label></div>
<div><input type="number" class="blue" id="property-color-blue"><label for="property-color-blue">Blue:</label></div>
</div>
</div>
</fieldset>
</fieldset>

485
scripts/system/html/js/entityProperties.js
View file

File diff suppressed because it is too large Load diff