summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUdo Walter2020-12-15 15:22:28 +0100
committerUdo Walter2020-12-15 15:22:28 +0100
commita050d693b1e80fdcceddcfbeced3826182c43eae (patch)
tree02a6582d41df999c0d2a28e713228ad65352319b
parent[sysconfig] Bump LDAP/AD module version to force rebuild (diff)
downloadslx-admin-a050d693b1e80fdcceddcfbeced3826182c43eae.tar.gz
slx-admin-a050d693b1e80fdcceddcfbeced3826182c43eae.tar.xz
slx-admin-a050d693b1e80fdcceddcfbeced3826182c43eae.zip
[roomplanner] Enable rotation of some objects
Enable roation of photocopier, printer, telephone, flatscreen, desk lamp and projector.
-rw-r--r--modules-available/roomplanner/images/electricalDevices_wIP/copier-east.pngbin0 -> 39293 bytes
-rw-r--r--modules-available/roomplanner/images/electricalDevices_wIP/copier-north.pngbin0 -> 36298 bytes
-rw-r--r--modules-available/roomplanner/images/electricalDevices_wIP/copier-south.pngbin0 -> 35255 bytes
-rw-r--r--modules-available/roomplanner/images/electricalDevices_wIP/copier-west.pngbin0 -> 39294 bytes
-rw-r--r--modules-available/roomplanner/images/electricalDevices_wIP/printer-east.pngbin0 -> 9589 bytes
-rw-r--r--modules-available/roomplanner/images/electricalDevices_wIP/printer-north.pngbin0 -> 10211 bytes
-rw-r--r--modules-available/roomplanner/images/electricalDevices_wIP/printer-south.pngbin0 -> 9472 bytes
-rw-r--r--modules-available/roomplanner/images/electricalDevices_wIP/printer-west.pngbin0 -> 9644 bytes
-rw-r--r--modules-available/roomplanner/images/electricalDevices_wIP/telephone-east.pngbin0 -> 33545 bytes
-rw-r--r--modules-available/roomplanner/images/electricalDevices_wIP/telephone-north.pngbin0 -> 33815 bytes
-rw-r--r--modules-available/roomplanner/images/electricalDevices_wIP/telephone-south.pngbin0 -> 31658 bytes
-rw-r--r--modules-available/roomplanner/images/electricalDevices_wIP/telephone-west.pngbin0 -> 33511 bytes
-rw-r--r--modules-available/roomplanner/images/electricalDevices_woIP/flatscreen-east.pngbin0 -> 23508 bytes
-rw-r--r--modules-available/roomplanner/images/electricalDevices_woIP/flatscreen-north.pngbin0 -> 23804 bytes
-rw-r--r--modules-available/roomplanner/images/electricalDevices_woIP/flatscreen-south.pngbin0 -> 23454 bytes
-rw-r--r--modules-available/roomplanner/images/electricalDevices_woIP/flatscreen-west.pngbin0 -> 24322 bytes
-rw-r--r--modules-available/roomplanner/images/electricalDevices_woIP/lamp-east.pngbin0 -> 59715 bytes
-rw-r--r--modules-available/roomplanner/images/electricalDevices_woIP/lamp-north.pngbin0 -> 63087 bytes
-rw-r--r--modules-available/roomplanner/images/electricalDevices_woIP/lamp-south.pngbin0 -> 63086 bytes
-rw-r--r--modules-available/roomplanner/images/electricalDevices_woIP/lamp-west.pngbin0 -> 60989 bytes
-rw-r--r--modules-available/roomplanner/images/electricalDevices_woIP/tvcamera-east.pngbin0 -> 6066 bytes
-rw-r--r--modules-available/roomplanner/images/electricalDevices_woIP/tvcamera-north.pngbin0 -> 7330 bytes
-rw-r--r--modules-available/roomplanner/images/electricalDevices_woIP/tvcamera-south.pngbin0 -> 7376 bytes
-rw-r--r--modules-available/roomplanner/images/electricalDevices_woIP/tvcamera-west.pngbin0 -> 6475 bytes
-rw-r--r--modules-available/roomplanner/style.css107
-rw-r--r--modules-available/roomplanner/templates/item-selector.html12
26 files changed, 93 insertions, 26 deletions
diff --git a/modules-available/roomplanner/images/electricalDevices_wIP/copier-east.png b/modules-available/roomplanner/images/electricalDevices_wIP/copier-east.png
new file mode 100644
index 00000000..e5b6d562
--- /dev/null
+++ b/modules-available/roomplanner/images/electricalDevices_wIP/copier-east.png
Binary files differ
diff --git a/modules-available/roomplanner/images/electricalDevices_wIP/copier-north.png b/modules-available/roomplanner/images/electricalDevices_wIP/copier-north.png
new file mode 100644
index 00000000..9d12ff3c
--- /dev/null
+++ b/modules-available/roomplanner/images/electricalDevices_wIP/copier-north.png
Binary files differ
diff --git a/modules-available/roomplanner/images/electricalDevices_wIP/copier-south.png b/modules-available/roomplanner/images/electricalDevices_wIP/copier-south.png
new file mode 100644
index 00000000..24cdc2ae
--- /dev/null
+++ b/modules-available/roomplanner/images/electricalDevices_wIP/copier-south.png
Binary files differ
diff --git a/modules-available/roomplanner/images/electricalDevices_wIP/copier-west.png b/modules-available/roomplanner/images/electricalDevices_wIP/copier-west.png
new file mode 100644
index 00000000..3d4dd6ad
--- /dev/null
+++ b/modules-available/roomplanner/images/electricalDevices_wIP/copier-west.png
Binary files differ
diff --git a/modules-available/roomplanner/images/electricalDevices_wIP/printer-east.png b/modules-available/roomplanner/images/electricalDevices_wIP/printer-east.png
new file mode 100644
index 00000000..5ebe9866
--- /dev/null
+++ b/modules-available/roomplanner/images/electricalDevices_wIP/printer-east.png
Binary files differ
diff --git a/modules-available/roomplanner/images/electricalDevices_wIP/printer-north.png b/modules-available/roomplanner/images/electricalDevices_wIP/printer-north.png
new file mode 100644
index 00000000..675e1788
--- /dev/null
+++ b/modules-available/roomplanner/images/electricalDevices_wIP/printer-north.png
Binary files differ
diff --git a/modules-available/roomplanner/images/electricalDevices_wIP/printer-south.png b/modules-available/roomplanner/images/electricalDevices_wIP/printer-south.png
new file mode 100644
index 00000000..ec851e04
--- /dev/null
+++ b/modules-available/roomplanner/images/electricalDevices_wIP/printer-south.png
Binary files differ
diff --git a/modules-available/roomplanner/images/electricalDevices_wIP/printer-west.png b/modules-available/roomplanner/images/electricalDevices_wIP/printer-west.png
new file mode 100644
index 00000000..99033b92
--- /dev/null
+++ b/modules-available/roomplanner/images/electricalDevices_wIP/printer-west.png
Binary files differ
diff --git a/modules-available/roomplanner/images/electricalDevices_wIP/telephone-east.png b/modules-available/roomplanner/images/electricalDevices_wIP/telephone-east.png
new file mode 100644
index 00000000..3581ff67
--- /dev/null
+++ b/modules-available/roomplanner/images/electricalDevices_wIP/telephone-east.png
Binary files differ
diff --git a/modules-available/roomplanner/images/electricalDevices_wIP/telephone-north.png b/modules-available/roomplanner/images/electricalDevices_wIP/telephone-north.png
new file mode 100644
index 00000000..8c6fb85d
--- /dev/null
+++ b/modules-available/roomplanner/images/electricalDevices_wIP/telephone-north.png
Binary files differ
diff --git a/modules-available/roomplanner/images/electricalDevices_wIP/telephone-south.png b/modules-available/roomplanner/images/electricalDevices_wIP/telephone-south.png
new file mode 100644
index 00000000..207bfe56
--- /dev/null
+++ b/modules-available/roomplanner/images/electricalDevices_wIP/telephone-south.png
Binary files differ
diff --git a/modules-available/roomplanner/images/electricalDevices_wIP/telephone-west.png b/modules-available/roomplanner/images/electricalDevices_wIP/telephone-west.png
new file mode 100644
index 00000000..89780d44
--- /dev/null
+++ b/modules-available/roomplanner/images/electricalDevices_wIP/telephone-west.png
Binary files differ
diff --git a/modules-available/roomplanner/images/electricalDevices_woIP/flatscreen-east.png b/modules-available/roomplanner/images/electricalDevices_woIP/flatscreen-east.png
new file mode 100644
index 00000000..de05797c
--- /dev/null
+++ b/modules-available/roomplanner/images/electricalDevices_woIP/flatscreen-east.png
Binary files differ
diff --git a/modules-available/roomplanner/images/electricalDevices_woIP/flatscreen-north.png b/modules-available/roomplanner/images/electricalDevices_woIP/flatscreen-north.png
new file mode 100644
index 00000000..52b650a0
--- /dev/null
+++ b/modules-available/roomplanner/images/electricalDevices_woIP/flatscreen-north.png
Binary files differ
diff --git a/modules-available/roomplanner/images/electricalDevices_woIP/flatscreen-south.png b/modules-available/roomplanner/images/electricalDevices_woIP/flatscreen-south.png
new file mode 100644
index 00000000..8c4bfb7f
--- /dev/null
+++ b/modules-available/roomplanner/images/electricalDevices_woIP/flatscreen-south.png
Binary files differ
diff --git a/modules-available/roomplanner/images/electricalDevices_woIP/flatscreen-west.png b/modules-available/roomplanner/images/electricalDevices_woIP/flatscreen-west.png
new file mode 100644
index 00000000..39708ba5
--- /dev/null
+++ b/modules-available/roomplanner/images/electricalDevices_woIP/flatscreen-west.png
Binary files differ
diff --git a/modules-available/roomplanner/images/electricalDevices_woIP/lamp-east.png b/modules-available/roomplanner/images/electricalDevices_woIP/lamp-east.png
new file mode 100644
index 00000000..584ea1d9
--- /dev/null
+++ b/modules-available/roomplanner/images/electricalDevices_woIP/lamp-east.png
Binary files differ
diff --git a/modules-available/roomplanner/images/electricalDevices_woIP/lamp-north.png b/modules-available/roomplanner/images/electricalDevices_woIP/lamp-north.png
new file mode 100644
index 00000000..e9805690
--- /dev/null
+++ b/modules-available/roomplanner/images/electricalDevices_woIP/lamp-north.png
Binary files differ
diff --git a/modules-available/roomplanner/images/electricalDevices_woIP/lamp-south.png b/modules-available/roomplanner/images/electricalDevices_woIP/lamp-south.png
new file mode 100644
index 00000000..96b8bbc1
--- /dev/null
+++ b/modules-available/roomplanner/images/electricalDevices_woIP/lamp-south.png
Binary files differ
diff --git a/modules-available/roomplanner/images/electricalDevices_woIP/lamp-west.png b/modules-available/roomplanner/images/electricalDevices_woIP/lamp-west.png
new file mode 100644
index 00000000..1c6203a0
--- /dev/null
+++ b/modules-available/roomplanner/images/electricalDevices_woIP/lamp-west.png
Binary files differ
diff --git a/modules-available/roomplanner/images/electricalDevices_woIP/tvcamera-east.png b/modules-available/roomplanner/images/electricalDevices_woIP/tvcamera-east.png
new file mode 100644
index 00000000..c57833b2
--- /dev/null
+++ b/modules-available/roomplanner/images/electricalDevices_woIP/tvcamera-east.png
Binary files differ
diff --git a/modules-available/roomplanner/images/electricalDevices_woIP/tvcamera-north.png b/modules-available/roomplanner/images/electricalDevices_woIP/tvcamera-north.png
new file mode 100644
index 00000000..0ce942e5
--- /dev/null
+++ b/modules-available/roomplanner/images/electricalDevices_woIP/tvcamera-north.png
Binary files differ
diff --git a/modules-available/roomplanner/images/electricalDevices_woIP/tvcamera-south.png b/modules-available/roomplanner/images/electricalDevices_woIP/tvcamera-south.png
new file mode 100644
index 00000000..9914e553
--- /dev/null
+++ b/modules-available/roomplanner/images/electricalDevices_woIP/tvcamera-south.png
Binary files differ
diff --git a/modules-available/roomplanner/images/electricalDevices_woIP/tvcamera-west.png b/modules-available/roomplanner/images/electricalDevices_woIP/tvcamera-west.png
new file mode 100644
index 00000000..175502fd
--- /dev/null
+++ b/modules-available/roomplanner/images/electricalDevices_woIP/tvcamera-west.png
Binary files differ
diff --git a/modules-available/roomplanner/style.css b/modules-available/roomplanner/style.css
index 70feb946..0ee6d923 100644
--- a/modules-available/roomplanner/style.css
+++ b/modules-available/roomplanner/style.css
@@ -112,11 +112,6 @@ div.vertical div.img {
[itemlook="door-wn"] { background: url('images/wall/door-wn.png') no-repeat;}
[itemlook="door-ws"] { background: url('images/wall/door-ws.png') no-repeat;}
-[itemlook="copier"] {
- background: url('images/electricalDevices_wIP/copier.png') no-repeat;
- }
-
-
[itemlook|="pc"] {
border: 1px solid #999;
border-radius: 4px;
@@ -139,30 +134,102 @@ div.vertical div.img {
}
-[itemlook="printer"] {
- background: url('images/electricalDevices_wIP/printer.png') no-repeat;
+[itemlook="copier-east"] {
+ background: url('images/electricalDevices_wIP/copier-east.png') no-repeat;
+}
- }
+[itemlook="copier-south"] {
+ background: url('images/electricalDevices_wIP/copier-south.png') no-repeat;
+}
-[itemlook="telephone"] {
- background: url('images/electricalDevices_wIP/telephone.png') no-repeat;
+[itemlook="copier-west"] {
+ background: url('images/electricalDevices_wIP/copier-west.png') no-repeat;
+}
- }
+[itemlook="copier-north"] {
+ background: url('images/electricalDevices_wIP/copier-north.png') no-repeat;
+}
-[itemlook="flatscreen"] {
- background: url('images/electricalDevices_woIP/flatscreen.png') no-repeat;
+[itemlook="printer-east"] {
+ background: url('images/electricalDevices_wIP/printer-east.png') no-repeat;
+}
- }
+[itemlook="printer-south"] {
+ background: url('images/electricalDevices_wIP/printer-south.png') no-repeat;
+}
-[itemlook="lamp"] {
- background: url('images/electricalDevices_woIP/lamp.png') no-repeat;
+[itemlook="printer-west"] {
+ background: url('images/electricalDevices_wIP/printer-west.png') no-repeat;
+}
- }
+[itemlook="printer-north"] {
+ background: url('images/electricalDevices_wIP/printer-north.png') no-repeat;
+}
-[itemlook="tvcamera"] {
- background: url('images/electricalDevices_woIP/tvcamera.png') no-repeat;
+[itemlook="telephone-east"] {
+ background: url('images/electricalDevices_wIP/telephone-east.png') no-repeat;
+}
- }
+[itemlook="telephone-south"] {
+ background: url('images/electricalDevices_wIP/telephone-south.png') no-repeat;
+}
+
+[itemlook="telephone-west"] {
+ background: url('images/electricalDevices_wIP/telephone-west.png') no-repeat;
+}
+
+[itemlook="telephone-north"] {
+ background: url('images/electricalDevices_wIP/telephone-north.png') no-repeat;
+}
+
+
+[itemlook="flatscreen-east"] {
+ background: url('images/electricalDevices_woIP/flatscreen-east.png') no-repeat;
+}
+
+[itemlook="flatscreen-south"] {
+ background: url('images/electricalDevices_woIP/flatscreen-south.png') no-repeat;
+}
+
+[itemlook="flatscreen-west"] {
+ background: url('images/electricalDevices_woIP/flatscreen-west.png') no-repeat;
+}
+
+[itemlook="flatscreen-north"] {
+ background: url('images/electricalDevices_woIP/flatscreen-north.png') no-repeat;
+}
+
+[itemlook="lamp-east"] {
+ background: url('images/electricalDevices_woIP/lamp-east.png') no-repeat;
+}
+
+[itemlook="lamp-south"] {
+ background: url('images/electricalDevices_woIP/lamp-south.png') no-repeat;
+}
+
+[itemlook="lamp-west"] {
+ background: url('images/electricalDevices_woIP/lamp-west.png') no-repeat;
+}
+
+[itemlook="lamp-north"] {
+ background: url('images/electricalDevices_woIP/lamp-north.png') no-repeat;
+}
+
+[itemlook="tvcamera-east"] {
+ background: url('images/electricalDevices_woIP/tvcamera-east.png') no-repeat;
+}
+
+[itemlook="tvcamera-south"] {
+ background: url('images/electricalDevices_woIP/tvcamera-south.png') no-repeat;
+}
+
+[itemlook="tvcamera-west"] {
+ background: url('images/electricalDevices_woIP/tvcamera-west.png') no-repeat;
+}
+
+[itemlook="tvcamera-north"] {
+ background: url('images/electricalDevices_woIP/tvcamera-north.png') no-repeat;
+}
[itemlook="4chairs1squaretable"] {
background: url('images/furniture/4chairs1squaretable.png') no-repeat;
diff --git a/modules-available/roomplanner/templates/item-selector.html b/modules-available/roomplanner/templates/item-selector.html
index 6bc226cb..f4680cf1 100644
--- a/modules-available/roomplanner/templates/item-selector.html
+++ b/modules-available/roomplanner/templates/item-selector.html
@@ -90,15 +90,15 @@
data-height="100" data-width="100" title="PC" noresize=1></div>
</li>
<li>
- <div itemtype="pc" itemlook="copier" class="draggable" style="width:100px; height:100px;"
+ <div itemtype="pc" itemlook="copier-south" class="draggable" style="width:100px; height:100px;"
data-height="100" data-width="100" title="{{lang_photocopier}}" noresize=1></div>
</li>
<li>
- <div itemtype="pc" itemlook="printer" class="draggable" style="width:100px; height:100px;"
+ <div itemtype="pc" itemlook="printer-south" class="draggable" style="width:100px; height:100px;"
data-height="100" data-width="100" title="{{lang_printer}}" noresize=1></div>
</li>
<li>
- <div itemtype="pc" itemlook="telephone" class="draggable" style="width:100px; height:100px;"
+ <div itemtype="pc" itemlook="telephone-south" class="draggable" style="width:100px; height:100px;"
data-height="100" data-width="100" title="{{lang_telephone}}" noresize=1></div>
</li>
</ul>
@@ -107,15 +107,15 @@
<div role="tabpanel" class="tab-pane" id="electricaldevices">
<ul class="toollist">
<li>
- <div itemtype="furniture" itemlook="flatscreen" class="draggable" style="width:75px; height:100px;"
+ <div itemtype="furniture" itemlook="flatscreen-east" class="draggable" style="width:75px; height:100px;"
data-height="100" data-width="75" title="{{lang_flatscreen}}"></div>
</li>
<li>
- <div itemtype="furniture" itemlook="lamp" class="draggable" style="width:125px; height:50px;"
+ <div itemtype="furniture" itemlook="lamp-east" class="draggable" style="width:125px; height:50px;"
data-height="50" data-width="125" title="{{lang_deskLamp}}"></div>
</li>
<li>
- <div itemtype="furniture" itemlook="tvcamera" class="draggable" style="width:125px; height:50px;"
+ <div itemtype="furniture" itemlook="tvcamera-east" class="draggable" style="width:125px; height:50px;"
data-height="50" data-width="125" title="{{lang_projector}}"></div>
</li>
</ul>